Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

storage: deflake TestStoreRangeMergeSlowAbandonedFollower #32609

Merged
merged 1 commit into from
Nov 26, 2018

Conversation

benesch
Copy link
Contributor

@benesch benesch commented Nov 26, 2018

This test needs to wait for store2 to process the split before it blocks
traffic to the LHS of the merge. The old approach admitted a race where
it would proceed before store2's replica of the RHS was initialized.

Fix #32590.

Release note: None

This test needs to wait for store2 to process the split before it blocks
traffic to the LHS of the merge. The old approach admitted a race where
it would proceed before store2's replica of the RHS was initialized.

Fix cockroachdb#32590.

Release note: None
@benesch benesch requested review from bdarnell, tbg and a team November 26, 2018 20:53
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Member

@tbg tbg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 1 files at r1.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained

@benesch
Copy link
Contributor Author

benesch commented Nov 26, 2018

Many thanks! 🙇

bors r=tschottdorf

craig bot pushed a commit that referenced this pull request Nov 26, 2018
32609: storage: deflake TestStoreRangeMergeSlowAbandonedFollower r=tschottdorf a=benesch

This test needs to wait for store2 to process the split before it blocks
traffic to the LHS of the merge. The old approach admitted a race where
it would proceed before store2's replica of the RHS was initialized.

Fix #32590.

Release note: None

Co-authored-by: Nikhil Benesch <nikhil.benesch@gmail.com>
@craig
Copy link
Contributor

craig bot commented Nov 26, 2018

Build succeeded

@craig craig bot merged commit 6e9bc2d into cockroachdb:master Nov 26, 2018
@benesch benesch deleted the deflake-merge-test branch December 6, 2018 20:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants