storage: deflake TestReplicateQueueRebalance #29221
Merged
+11
−1
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
|
This change is |
a-robinson
approved these changes
Aug 29, 2018
pkg/storage/replicate_queue_test.go
Outdated
| @@ -52,6 +52,8 @@ func TestReplicateQueueRebalance(t *testing.T) { | |||
| for _, server := range tc.Servers { | |||
| st := server.ClusterSettings() | |||
| st.Manual.Store(true) | |||
| // TODO(benesch): Figure out why the merge queue causes this test to flake. | |||
There was a problem hiding this comment.
Because we're doing manual splits on line 64, presumably.
There was a problem hiding this comment.
Yep. I figured that out after adding this comment.
Disable the merge queue in this test as it interferes with the splits that are performed manually. Fixes cockroachdb#28563 Release note: None
petermattis
force-pushed
the
pmattis/deflake-test-replicate-queue-rebalance
branch
from
04cfc87 to
f989f58
Compare
|
bors r=a-robinson |
craig bot
pushed a commit
that referenced
this pull request
Aug 29, 2018
29221: storage: deflake TestReplicateQueueRebalance r=a-robinson a=petermattis Temporarily disable the merge queue in this test. Fixes #28563 Release note: None Co-authored-by: Peter Mattis <[email protected]>
Build succeeded |
|
Thanks! 🙌 |
craig bot
pushed a commit
that referenced
this pull request
Aug 29, 2018
29237: backport-2.1: storage: deflake TestReplicateQueueRebalance r=tschottdorf a=benesch Backport 1/1 commits from #29221. /cc @cockroachdb/release --- Temporarily disable the merge queue in this test. Fixes #28563 Release note: None Co-authored-by: Peter Mattis <[email protected]>
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.
Temporarily disable the merge queue in this test.
Fixes #28563
Release note: None