downsample: fix deadlock if error occurs #4962
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
Fix deadlock that occurs if there is some backlog of blocks to be deduplicated, and an error occurs. For this to trigger, there needs to be at least `downsampleConcurrency + 2` blocks in the backlog. Add test to cover this regression. Affected versions 0.22.0 - 0.23.1. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
GiedriusS
force-pushed
the
fix_downsampling_deadlock
branch
from
1488f4b
to
76c9019
Compare
wiardvanrij
approved these changes
Dec 17, 2021
bwplotka
approved these changes
Dec 17, 2021
It does, the test shows that. :D It's enough to have an error occur while downsampling and to have some blocks in the downsampling backlog for this to occur. Most of the time it is enough to have two extra in the backlog but if you are lucky (depending on the scheduler) the deadlock might not happen |
GiedriusS
added a commit
to GiedriusS/thanos
that referenced
this pull request
Dec 17, 2021
Fix deadlock that occurs if there is some backlog of blocks to be deduplicated, and an error occurs. For this to trigger, there needs to be at least `downsampleConcurrency + 2` blocks in the backlog. Add test to cover this regression. Affected versions 0.22.0 - 0.23.1. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
|
👍🏽 |
GiedriusS
added a commit
that referenced
this pull request
Dec 20, 2021
Fix deadlock that occurs if there is some backlog of blocks to be deduplicated, and an error occurs. For this to trigger, there needs to be at least `downsampleConcurrency + 2` blocks in the backlog. Add test to cover this regression. Affected versions 0.22.0 - 0.23.1. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
squat
pushed a commit
that referenced
this pull request
Dec 20, 2021
* downsample: fix deadlock if error occurs (#4962) Fix deadlock that occurs if there is some backlog of blocks to be deduplicated, and an error occurs. For this to trigger, there needs to be at least `downsampleConcurrency + 2` blocks in the backlog. Add test to cover this regression. Affected versions 0.22.0 - 0.23.1. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * VERSION: bump Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * Makefile: update SHA256 Update from https://github.com/thanos-io/thanos/blob/main/Makefile#L16-L17. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * *: 0.23.2 -> 0.23.2-rc.1 Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
GiedriusS
added a commit
that referenced
this pull request
Dec 20, 2021
* Update version Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * downsample: fix deadlock if error occurs (#4962) Fix deadlock that occurs if there is some backlog of blocks to be deduplicated, and an error occurs. For this to trigger, there needs to be at least `downsampleConcurrency + 2` blocks in the backlog. Add test to cover this regression. Affected versions 0.22.0 - 0.23.1. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * Makefile: update SHA256 Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * Makefile/CHANGELOG: fix format Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
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.
Fix deadlock that occurs if there is some backlog of blocks to be
deduplicated, and an error occurs. For this to trigger, there needs to
be at least
downsampleConcurrency + 2blocks in the backlog.Add test to cover this regression. Affected versions 0.22.0 - 0.23.1.
Fixes #4960.
Signed-off-by: Giedrius Statkevičius giedrius.statkevicius@vinted.com