Distributor: improve wrapping of gRPC errors returned by the ingester #6426
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: Yuri Nikolic <durica.nikolic@grafana.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.
What this PR does
This PR fixes a regression introduced by #6416, where we replaced usages of
grpc/statuswithgogo/statusfor ingester's gRPC error creation.Namely, if an error created by
gogo'sstatus.Error()is wrapped (for example by usingerrors.Wrap()orfmt.Errorf("...%w..."), the resulting error is not recognized bystatus.FromError(). In the case of grpc'sstatus.Error()this was not the case, i.e., even wrapped errors were recognized bygrpc'sstatus.FromError().Therefore, the only place where ingester errors are wrapped (
Distributor.handleIngesterPushError()) must be updated in such a way that even the wrapped gRPC errors coming from the ingester preserve their type and semantics.Which issue(s) this PR fixes or relates to
Part of #6008
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]