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

kvserver: deflake TestMergeQueueSeesNonVoters #106760

Merged
merged 1 commit into from
Jul 17, 2023

Conversation

miraradeva
Copy link
Contributor

TestMergeQueueSeesNonVoters was flaky because of a race between turning the merge queue on and off. The merge queue was first turned on via a cluster config, and then turned off using the store directly. However, it's possible for the cluster config to take effect after the queue was turned off via the store and leave the merge queue on for the rest of the test, causing unexpected range merges. The cluster config is actually unnecessary, so this change just removes it.

Fixes: #105726
Epic: CRDB-29164

Release note: None

TestMergeQueueSeesNonVoters was flaky because of a race between turning
the merge queue on and off. The merge queue was first turned on via a
cluster config, and then turned off using the store directly. However,
it's possible for the cluster config to take effect after the queue was
turned off via the store and leave the merge queue on for the rest of
the test, causing unexpected range merges. The cluster config is
actually unnecessary, so this change just removes it.

Fixes: cockroachdb#105726
Epic: CRDB-29164

Release note: None
@miraradeva miraradeva requested a review from a team as a code owner July 13, 2023 15:43
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@miraradeva
Copy link
Contributor Author

bors r=tbg

@craig
Copy link
Contributor

craig bot commented Jul 17, 2023

Build succeeded:

@craig craig bot merged commit b87dec8 into cockroachdb:master Jul 17, 2023
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.

kvserver: TestMergeQueueSeesNonVoters/partially-collocated-voters-only failed
3 participants