blockcache: fix datarace in blockcache_test #7029
Merged
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
ellemouton
reviewed
Oct 13, 2022
There was a problem hiding this comment.
Hi @MStreet3! Thanks for the PR.
I think the only changes required to solve the linked issue are:
- the
m.RLock()andm.RUnlock()in theGetBlockmethod ofmockChainBackendneed to converted tom.Lock()andm.Unlock() - create the
chainCallCountgetter
MStreet3
force-pushed
the
bug/blockcache-test-data-race
branch
2 times, most recently
from
a5cfa02
to
6ec1db1
Compare
MStreet3
force-pushed
the
bug/blockcache-test-data-race
branch
2 times, most recently
from
4b076c3
to
9e22ba6
Compare
ellemouton
requested changes
Oct 13, 2022
MStreet3
force-pushed
the
bug/blockcache-test-data-race
branch
2 times, most recently
from
43ed06f
to
0174c14
Compare
mockChainBackend simulates a chain backend and tracks the number of calls via a private property called chainCallCount. This commit uses a write mutex instead of read mutex in the call to GetBlock, adds a getter method to access chainCallCount with a read mutex and uses a write mutex in resetChainCallCount.
MStreet3
force-pushed
the
bug/blockcache-test-data-race
branch
from
5631b54
to
a51e1ae
Compare
guggero
approved these changes
Oct 13, 2022
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.
This PR fixes an issue with a data race in the
blockcachetests.Change Description
GetBlockinstead of a read mutex.resetChainCallCountinstead of a read mutex.chainCallCountproperty with a read mutex.Steps to Test
The test failure is a flake (i.e., non-deterministic), but these tests pass with the
-raceflag.fixes #6915