release-25.1: sql: deflake TestDropDatabaseDeleteData #140766
+40
−1
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport 1/1 commits from #140653 on behalf of @iskettaneh.
/cc @cockroachdb/release
This commit deflakes the test by doing two things:
Delay the start of the test till after the zone config range feed has started already. This is used to avoid a race where we update
system.zones
before the full reconciliation of zone configs has started. The full reconciliation ignores dropped databases, and if we write tosystem.zones
before that, our write might not be reconciled. By delaying the test until the zone config range feed starts, we ensure that the full reconciliation has finished, and the range feed is ready to stream our changes.Relaxes the test expectation that only the first table gets purged first. This is because there there is a race between the splits and GC queue where range might get GCed before splitting. This is more likely to happen in this test since increase the GC queue scan rate.
Release note: None
Fixes: #138185
Release justification: