Fix bug in Bucket Series #7885
Merged
Fix bug in Bucket Series #7885
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
Applies the fix described in thanos-io#7883. Signed-off-by: Filip Petkovski <[email protected]>
Signed-off-by: Filip Petkovski <[email protected]>
GiedriusS
reviewed
Nov 5, 2024
pkg/store/bucket.go
Outdated
| @@ -1691,7 +1691,9 @@ func (s *BucketStore) Series(req *storepb.SeriesRequest, seriesSrv storepb.Store | |||
| // Merge the sub-results from each selected block. | |||
| tracing.DoInSpan(ctx, "bucket_store_merge_all", func(ctx context.Context) { | |||
| begin := time.Now() | |||
| set := NewResponseDeduplicator(NewProxyResponseLoserTree(respSets...)) | |||
| lt := NewProxyResponseLoserTree(respSets...) | |||
| defer lt.Close() | |||
There was a problem hiding this comment.
Do we need to call Close() outside of this func(context.Context) because before Flush() we could still hold onto these sets?
There was a problem hiding this comment.
Yes this is a good point. Should we move lt := NewProxyResponseLoserTree(respSets...) outside of the span function as well, and we can defer a close right after it?
Signed-off-by: Filip Petkovski <[email protected]>
|
We also noticed another issue in Cortex even after cherry-picking this change. The Store-Gateways were not able to sync blocks and was stuck at: Line 2507 in 9bc3cc0 |
GiedriusS
previously approved these changes
Nov 6, 2024
saswatamcode
previously approved these changes
Nov 6, 2024
Signed-off-by: Filip Petkovski <[email protected]>
fpetkovski
dismissed stale reviews from saswatamcode and GiedriusS
via
065c3be
GiedriusS
approved these changes
Nov 7, 2024
|
Do we want to address #7885 (comment) separately? |
|
Yes, will take a separate look 👍 |
GiedriusS
pushed a commit
to vinted/thanos
that referenced
this pull request
Nov 11, 2024
Fix bug in Bucket Series
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.
Applies the fix described in #7883.
Changes
Verification