kvserver: deflake test merge queue #97086
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
Previously, it was possible for ranges to spuriously merge when not expected to in `TestMergeQueue`. Unexpected merging occurred due to the merge delay interval being shorter than the time between test statements - so that a merge could sneak when it shouldn't have. This was only realistically possible running `--stress` and with a slower `deadlock` build. This commit updates the merge delay to be 1000 seconds, to avoid this situation occurring. Informs: cockroachdb#97000 Release note: None
|
This change is |
|
bors r=andrewbaptist |
|
Build succeeded: |
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.
Previously, it was possible for ranges to spuriously merge when not expected to in
TestMergeQueue. Unexpected merging occurred due to the merge delay interval being shorter than the time between test statements--stressand with a slowerdeadlockbuild.This commit updates the merge delay to be 1000 seconds, to avoid this situation occurring.
Informs: #97000
Release note: None