release-21.1: kvserver: deflake TestMergeQueue #66046
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The test started flaking after ce73bc1. The issue was that there was a race between when the merge queue was enabled via an `Override()` call and when these tests assert that a given range actually got merged away. In other words, these tests were sometime getting to their assertion before the relevant server learned that the merge queue was enabled. This patch modifies the test to instead enable the merge queue via SQL and not through the `Override()` call. Resolves cockroachdb#64866 Resolves cockroachdb#64056 Resolves cockroachdb#63009 Release note: None
|
This change is |
nvanbenschoten
approved these changes
Jun 4, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The test started flaking after ce73bc1. The issue was that there was a race
between when the merge queue was enabled via an
Override()call and whenthese tests assert that a given range actually got merged away. In other words,
these tests were sometime getting to their assertion before the relevant server
learned that the merge queue was enabled.
This patch modifies the test to instead enable the merge queue via SQL and not
through the
Override()call.Resolves #64866
Resolves #64056
Resolves #63009
Release note: None