Remove nested read lock to prevent deadlock #2128
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
|
notes from our chat:
|
prateek
reviewed
Jan 30, 2020
prateek
reviewed
Jan 30, 2020
src/dbnode/storage/shard.go
Outdated
| @@ -385,8 +385,12 @@ func (s *dbShard) RetrievableBlockColdVersion(blockStart time.Time) (int, error) | |||
| // BlockStatesSnapshot implements series.QueryableBlockRetriever | |||
| func (s *dbShard) BlockStatesSnapshot() series.ShardBlockStateSnapshot { | |||
| s.RLock() | |||
| defer s.RUnlock() | |||
| return s.blockStatesSnapshotWithRLock() | |||
There was a problem hiding this comment.
is it safe to acquire the flushState RLock while holding the shard RLock?
There was a problem hiding this comment.
Yep, I checked usages of the flushState Rlock and they don't conflict have a relationship anywhere else in the code, so this should be good.
Codecov Report
@@ Coverage Diff @@
## master #2128 +/- ##
=========================================
- Coverage 69.9% 51.2% -18.8%
=========================================
Files 1001 828 -173
Lines 86476 75886 -10590
=========================================
- Hits 60478 38863 -21615
- Misses 21715 33702 +11987
+ Partials 4283 3321 -962
Continue to review full report at Codecov.
|
prateek
reviewed
Jan 31, 2020
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.
What this PR does / why we need it:
Fixes #2127
Special notes for your reviewer:
Does this PR introduce a user-facing and/or backwards incompatible change?:
Does this PR require updating code package or user-facing documentation?: