Fix concurrent map access panic #6647
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
| @@ -18,6 +18,8 @@ | |||
| - [#6618](https://github.com/influxdata/influxdb/pull/6618): Optimize shard loading | |||
| - [#6629](https://github.com/influxdata/influxdb/issues/6629): query-log-enabled in config not ignored anymore. | |||
| - [#6607](https://github.com/influxdata/influxdb/issues/6607): SHOW TAG VALUES accepts != and !~ in WHERE clause. | |||
| - [#6235](https://github.com/influxdata/influxdb/issues/6235): Fix meaurement field panic in tsm1 engine. | |||
|
Minor nitpick but 👍 otherwise. |
|
Fixed. Will merge on circle green and a another +1 |
| e.measurementFields[measurement] = mf | ||
| } | ||
|
|
||
| mf := e.MeasurementFields(measurement) |
There was a problem hiding this comment.
Will this deadlock when called from LoadMetaDataIndex?
There was a problem hiding this comment.
eugh, it could if the measurement field doesn't exist.
Since addToIndexFromKey is sometimes called while under an RLock and sometimes isn't, this is going to take a little re-working. I'll push something up tomorrow
There was a problem hiding this comment.
@jwilder I just looked at this and realised it's the Cache's RLock that's taken in LoadMetaDataIndex, not the Engine's.
So we're good to go?
Closed
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 #6235