builder baseMap concurrent write fix lock #11588
Closed
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
Signed-off-by: Callum Styan <[email protected]>
Signed-off-by: Callum Styan <[email protected]>
Signed-off-by: Callum Styan <[email protected]>
|
Trivy scan found the following vulnerabilities:
|
dannykopping
reviewed
Jan 5, 2024
There was a problem hiding this comment.
Left a couple notes, but what's unclear to me is why this would address the issue fully... The panic occurs at pkg/logql/log/labels.go:468 which is when the newly-retrieved map from the pool is clear-ed, suggesting that we're putting a map back into the pool without removing all references to it. We can add the locks and that'll make the problem go away, but is the underlying issue not the references?
Comment on lines
+929
to
+930
| //for _, tt := range tests { | ||
| // t.Run(tt.fmt, func(t *testing.T) { |
There was a problem hiding this comment.
Suggested change
| //for _, tt := range tests { | |
| // t.Run(tt.fmt, func(t *testing.T) { |
| ls := labels.FromStrings("cluster", "us-central-0") | ||
| builder := NewBaseLabelsBuilder().ForLabels(ls, ls.Hash()) | ||
| wg := sync.WaitGroup{} | ||
| wg.Add(1) |
There was a problem hiding this comment.
Does this not need to be in the loop?
|
|
||
| } | ||
| wg.Done() | ||
| time.Sleep(2 * time.Second) |
|
superseded by #11607 |
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.
It looks like with either sufficiently large line formats, or line formats that have some kind of operation that results in two line formats being executed concurrently (somehow, I do not understand how), it's possible for us to end up with a concurrent write as part of
LineFormatter.Processcalls.This AFAICT existed before #11484 but a query was executed in one of our environments today that made us think the panic was from those changes. I suspect the baseMap usage is the underlying cause, and can confirm by deploying the changes from here into one of our environments tomorrow and running the same query I saw today that caused the panic.