Remove measurement from shard index on DROP #3002
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
otoolep
changed the title
| @@ -294,6 +294,8 @@ func (s *Shard) deleteMeasurement(name string, seriesKeys []string) error { | |||
| return err | |||
| } | |||
|
|
|||
| // Remove entry from shard index. | |||
| delete(s.measurementFields, name) | |||
There was a problem hiding this comment.
need to get the write mutex on the shard before doing this
There was a problem hiding this comment.
OK, let me do that.
otoolep
force-pushed
the
recreate_measurement_fail
branch
from
3211b2e
to
2f4b089
Compare
|
Correct locking added. |
| @@ -294,6 +294,10 @@ func (s *Shard) deleteMeasurement(name string, seriesKeys []string) error { | |||
| return err | |||
| } | |||
|
|
|||
| // Remove entry from shard index. | |||
| s.mu.Lock() | |||
There was a problem hiding this comment.
It doesn't seem necessary to lock for the entire function, so just doing it here.
|
+1 |
|
Thanks @pauldix -- merging now. |
otoolep
added a commit
that referenced
this pull request
Jun 16, 2015
Remove measurement from shard index on DROP
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.
When a measurement is DROPped, its record in the shard's inverted index must also be deleted.
Fixes issue #2955.