Fix deadlock in tsm1/file_store #6277
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
|
LGTM 👍 @benbjohnson I checked this against your recent performance PR and it doesn't seem to get in the way of your changes. |
|
CLA signed and changelog updated. |
|
@PierreF can you rebase this change? |
| @@ -514,15 +514,14 @@ func (f *FileStore) BlockCount(path string, idx int) int { | |||
|
|
|||
| // locations returns the files and index blocks for a key and time. ascending indicates | |||
| // whether the key will be scan in ascending time order or descenging time order. | |||
| // This function assumes the read-lock has been taken. | |||
There was a problem hiding this comment.
Can you add this same comment to newKeyCursor?
PierreF
force-pushed
the
tsm1-filestore-deadlock
branch
from
2b1260e
to
d4668af
Compare
|
Rebase + comment added |
|
Merging this since the Windows test failure doesn't seem to have anything to do with Windows. |
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 fix issue #6271
It remove the RLock from FileStore.locations.
This function is only called by newKeyCursor which itself is only called by FileStore.KeyCursor. FileStore.KeyCursor already acquire the RLock.