compact: unwrap the original error as well#2637
Merged
bwplotka merged 3 commits intothanos-io:masterfrom May 21, 2020
Merged
Conversation
Just like in IsHaltError(), let's unwrap the given error to see if is `terrors.MultiError`. This lets us detect the retryable errors as well: * `BucketCompactor.Compact` returns `terrors.MultiError` of wrapped errors; * `compactMainFn` wraps the previously returned error again. So, we need to unwrap it at the beginning, iterate over it, and then unwrap again which is what the code does with this change. Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Just like in IsHaltError(), let's unwrap the given error to see if is
terrors.MultiError. This lets us detect the retryable errors as well:BucketCompactor.Compactreturnsterrors.MultiErrorof wrappederrors;
compactMainFnwraps the previously returned error again.So, we need to unwrap it at the beginning, iterate over it, and then
unwrap again which is what the code does with this change.
Signed-off-by: Giedrius Statkevičius giedriuswork@gmail.com
Changes
IsRetryError()now detects wrappedterrors.MultiErrorwhich is what happens in some (if not all) cases.Verification
Amended unit tests.