Skip to content

Commit

Permalink
Merge pull request #105574 from cockroachdb/blathers/backport-release…
Browse files Browse the repository at this point in the history
…-23.1-105561

release-23.1: backupccl: skip timing based regression test under deadlock
  • Loading branch information
adityamaru authored Jun 27, 2023
2 parents 63904b2 + f3ee29d commit 2279c89
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion pkg/ccl/backupccl/backup_intents_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ func TestCleanupIntentsDuringBackupPerformanceRegression(t *testing.T) {
defer log.Scope(t).Close(t)
defer ccl.TestingEnableEnterprise()()

skip.UnderRace(t, "measures backup times not to regress, can't work under race")
skip.UnderRace(t, "measures backup times to ensure intent resolution does not regress, can't work under race")
skip.UnderDeadlock(t, "measures backup times to ensure intent resolution does not regress, can't work under deadlock")

// Time to create backup in presence of intents differs roughly 10x so some
// arbitrary number is picked which is 2x higher than current backup time on
Expand Down

0 comments on commit 2279c89

Please sign in to comment.