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

backport-2.1: storage: deflake TestStoreRangeMergeWatcher #31248

Merged
merged 1 commit into from Oct 11, 2018

Conversation

Projects
None yet
4 participants
@tschottdorf
Member

tschottdorf commented Oct 11, 2018

Backport 1/1 commits from #31215.

/cc @cockroachdb/release


This test could deadlock if the LHS replica on store2 was shut down
before it processed the split at "b". Teach the test to wait for the LHS
replica on store2 to process the split before blocking Raft traffic to
it.

Fixes #31096.
Fixes #31149.
Fixes #31160.
Fixes #31167.

Release note: None

storage: deflake TestStoreRangeMergeWatcher
This test could deadlock if the LHS replica on store2 was shut down
before it processed the split at "b". Teach the test to wait for the LHS
replica on store2 to process the split before blocking Raft traffic to
it.

Fixes #31096.
Fixes #31149.
Fixes #31160.
Fixes #31167.

Release note: None

@tschottdorf tschottdorf requested a review from benesch Oct 11, 2018

@tschottdorf tschottdorf requested a review from cockroachdb/core-prs as a code owner Oct 11, 2018

@cockroach-teamcity

This comment has been minimized.

Show comment
Hide comment
@cockroach-teamcity

cockroach-teamcity Oct 11, 2018

Member

This change is Reviewable

Member

cockroach-teamcity commented Oct 11, 2018

This change is Reviewable

@tschottdorf

This comment has been minimized.

Show comment
Hide comment
@tschottdorf

tschottdorf Oct 11, 2018

Member

TFTR!

Member

tschottdorf commented Oct 11, 2018

TFTR!

@tschottdorf tschottdorf merged commit 8f112dc into cockroachdb:release-2.1 Oct 11, 2018

2 checks passed

GitHub CI (Cockroach) TeamCity build finished
Details
license/cla Contributor License Agreement is signed.
Details

@tschottdorf tschottdorf deleted the tschottdorf:backport2.1-31215 branch Oct 11, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment