Merge v0.12.1 into master #2500
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
* store: proxy: add test for deadlocking problem Signed-off-by: Giedrius Statkevičius <[email protected]> * store: proxy: add fix for timeouts Checking here if the series context has ended is the correct fix here. We want to check it because if any of the other Series() calls error out then the context is canceled. So, it is equal to checking for errors "downstream", in `mergedSeriesSet`. Also, `handleErr()` here is the correct function to use because in such a case we want to set `s.err` -- if `io.EOF` still hasn't been received then it means that StoreAPI still has some data that it wants to send but hasn't yet. With this, the previously added test passes. Signed-off-by: Giedrius Statkevičius <[email protected]> Co-authored-by: Giedrius Statkevičius <[email protected]>
Related to: #2459 Signed-off-by: Bartlomiej Plotka <[email protected]>
Fixes: #2471 This commit fixes an issue where multiple goroutines in the block fetcher filtering were concurrently accessing the same map. The goroutines were concurrently writing AND reading to the shared metas map. This commit guards this concurrent access by giving the DeduplicateFilter struct a mutex. Signed-off-by: Lucas Servén Marín <[email protected]>
Fixes #2459 (quick fix). This keeps the logic from the 0.11.0 which was good enough. Some improvement for future: #2470 Signed-off-by: Bartlomiej Plotka <[email protected]>
Signed-off-by: Lucas Servén Marín <[email protected]>
Signed-off-by: yeya24 <[email protected]> Signed-off-by: Lucas Servén Marín <[email protected]> Co-authored-by: yeya24 <[email protected]>
|
Note: this needs a real merge, not a squash, so we need to temporarily override the repo settings once this PR is approved |
povilasv
approved these changes
Apr 22, 2020
2 tasks
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.
This PR merges the release-0.12 branch back into master to get all of the 0.12.1 changes in master.
cc @thanos-io/thanos-maintainers