Skip to content

Commit

Permalink
Merge pull request #135724 from cockroachdb/blathers/backport-release…
Browse files Browse the repository at this point in the history
…-23.2-135715

release-23.2: ccl/schemachangerccl: deflake TestBackupSuccess
  • Loading branch information
fqazi authored Nov 20, 2024
2 parents 40c6dbe + daa5e4f commit a81b06f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/sql/schemachanger/sctest/framework.go
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,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"
Expand Down

0 comments on commit a81b06f

Please sign in to comment.