Skip to content

kvserver: de-flake TestMergeQueueSeesLearnerOrJointConfig#105642

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
irfansharif:230627.fix-TestMergeQueueSeesLearnerOrJointConfig
Jun 29, 2023
Merged

kvserver: de-flake TestMergeQueueSeesLearnerOrJointConfig#105642
craig[bot] merged 1 commit intocockroachdb:masterfrom
irfansharif:230627.fix-TestMergeQueueSeesLearnerOrJointConfig

Conversation

@irfansharif
Copy link
Copy Markdown
Contributor

Fixes #105381. It was possible for us to receive client-side store IDs concurrently with the server-side stopper being quiesced, at which point we read the variable storing the client-side store IDs without a mutex (which triggered the data race detector). The data race was benign, but instead of adding a synchronization primitive, we recognize that there was no reason for the store ID handling to happen on separate threads.

Release note: None

Fixes cockroachdb#105381. It was possible for us to receive client-side store IDs
concurrently with the server-side stopper being quiesced, at which point
we read the variable storing the client-side store IDs without a mutex
(which triggered the data race detector). The data race was benign, but
instead of adding a synchronization primitive, we recognize that there
was no reason for the store ID handling to happen on separate threads.

Release note: None
@irfansharif irfansharif requested review from a team and bananabrick June 27, 2023 18:06
@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Jun 27, 2023

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Contributor

@bananabrick bananabrick left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained

@irfansharif
Copy link
Copy Markdown
Contributor Author

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jun 29, 2023

Build succeeded:

@craig craig bot merged commit c1d73cd into cockroachdb:master Jun 29, 2023
@irfansharif irfansharif deleted the 230627.fix-TestMergeQueueSeesLearnerOrJointConfig branch June 30, 2023 15:28
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: TestMergeQueueSeesLearnerOrJointConfig data race

3 participants