Merge pull request #135727 from cockroachdb/blathers/backport-release…

…-24.3-135715 release-24.3: ccl/schemachangerccl: deflake TestBackupSuccess
cockroachdb · Nov 20, 2024 · b6e0c93 · b6e0c93
2 parents 85ffa3d + dbf9463
commit b6e0c93
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/sql/schemachanger/sctest/framework.go b/pkg/sql/schemachanger/sctest/framework.go
@@ -949,7 +949,7 @@ func waitForSchemaChangesToFinish(t *testing.T, tdb *sqlutils.SQLRunner) {
 
 func hasLatestSchemaChangeSucceeded(t *testing.T, tdb *sqlutils.SQLRunner) bool {
 	result := tdb.QueryStr(t, fmt.Sprintf(
-		`SELECT status FROM [SHOW JOBS] WHERE job_type IN ('%s') ORDER BY finished DESC LIMIT 1`,
+		`SELECT status FROM [SHOW JOBS] WHERE job_type IN ('%s') ORDER BY finished DESC, job_id DESC LIMIT 1`,
 		jobspb.TypeNewSchemaChange,
 	))
 	return result[0][0] == "succeeded"