Fixes races in multiline stage and promtail. #3302
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
Not fully sure how this was happening, but I have a test showing it's possible and a fix for it. I think it should fix grafana#3120. I also remove race within some tests of promtail. Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
jeschkies
reviewed
Feb 8, 2021
| collapsed := Entry{ | ||
| Extracted: s.startLineEntry.Extracted, | ||
| Extracted: extracted, |
There was a problem hiding this comment.
That's interesting. I thought Extracted would be a value not a reference. few minutes googling later
Ok, maps are references, see https://blog.golang.org/maps:
Map types are reference types, like pointers or slices, and so the value of m above is nil; it doesn't point to an initialized map.
🤦
So either we send a copy across the channel. Or we reset the entry but that would be a little bit more complicated.
Closed
|
This looks like it worked! I ran the original test-case I was using before on master, it panics literally immediately, and after switching to a build of promtail from this branch, it's running through the logs, updating my cursor, etc, no panic. |
jeschkies
approved these changes
Feb 12, 2021
sandeepsukhani
approved these changes
Feb 16, 2021
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.
Not fully sure how this was happening, but I have a test showing it's possible and a fix for it.
I think it should fix #3120.
I also remove race within some tests of promtail.
/cc @jeschkies WDYT ?
Signed-off-by: Cyril Tovena cyril.tovena@gmail.com