Fix race on Cache entry #8885
Merged
Fix race on Cache entry #8885
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
jwilder
suggested changes
Sep 27, 2017
tsdb/engine/tsm1/engine.go
Outdated
| @@ -1331,7 +1331,9 @@ func (e *Engine) onFileStoreReplace(newFiles []TSMFile) { | |||
|
|
|||
| // load metadata from the Cache | |||
| e.Cache.ApplyEntryFn(func(key []byte, entry *entry) error { | |||
| entry.mu.RLock() | |||
There was a problem hiding this comment.
Instead of touching the entries lock from the engine, can you change this to have a entry.InfluxQLType() instead that keeps the locking private to the entry?
e-dard
force-pushed
the
er-entry-race
branch
from
8431193 to
d0b81c1
Compare
|
@jwilder updated. |
jwilder
approved these changes
Sep 27, 2017
3 tasks
|
Backport #8887 |
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.
Required for all non-trivial PRs
Fixes a race on the
Cacheentry.