Merge #150864

150864: backup: deflake TestScheduleChainingWithDatabaseExpansion r=kev-cao a=msbutler

In TestScheduleChainingWithDatabaseExpansion, the test hook manipulates the server time and sets the system time the backups are executed at to the server time. For mysterious reasons (maybe overload/scheduling latency?), this server time can occasionally exceed the backup statement execution time, which causes the backup statement to fail, with a aost timestamp "is in the future" error. Since this test already curves space time, I didn't dig further into the root cause of this behavior and instead ensured the backup aost is never greater than the statement time.

Informs #150557

Release note: none

Co-authored-by: Michael Butler <[email protected]>

Author: craig[bot]

pkg/backup/schedule_pts_chaining_test.go

@@ -422,8 +422,13 @@ INSERT INTO t select x, y from generate_series(1, 100) as g(x), generate_series(
 `)
 
 	backupAsOfTimes := make([]time.Time, 0)
-	th.cfg.TestingKnobs.(*jobs.TestingKnobs).OverrideAsOfClause = func(clause *tree.AsOfClause, _ time.Time) {
+	th.cfg.TestingKnobs.(*jobs.TestingKnobs).OverrideAsOfClause = func(clause *tree.AsOfClause, statementTime time.Time) {
 		backupAsOfTime := th.cfg.DB.KV().Clock().PhysicalTime()
+		if backupAsOfTime.After(statementTime) {
+			// If the backupAsOfTime is after the statement time, then we use the
+			// statement time.
+			backupAsOfTime = statementTime
+		}
 		expr, err := tree.MakeDTimestampTZ(backupAsOfTime, time.Microsecond)
 		require.NoError(t, err)
 		clause.Expr = expr