fix(retry): fix retries when using protobuf encoding - #13316
Merged
Conversation
| // Retry if we get a HTTP 500 or a non-HTTP error. | ||
| httpResp, ok := httpgrpc.HTTPResponseFromError(err) | ||
| if !ok || httpResp.Code/100 == 5 { | ||
| status, ok := status.FromError(err) |
Contributor
There was a problem hiding this comment.
Could this approach work for you:
if !IsClientError(err) {
...
}
where
func isClientError(err error) bool {
if grpcutil.ErrorToStatusCode(err); code/100 == 4 {
return true
}
return false
}
and grpcutil comes from dskit?
Contributor
|
This PR must be merged before a backport PR will be created. |
1 similar comment
Contributor
|
This PR must be merged before a backport PR will be created. |
grafanabot
pushed a commit
that referenced
this pull request
Jul 1, 2024
(cherry picked from commit a457c5d)
7 tasks
This was referenced Jul 8, 2024
This was referenced Aug 15, 2024
This was referenced Oct 14, 2024
This was referenced Oct 21, 2024
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
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 / why we need it:
retry.goexpects the Details field of grpc status to be populated which it then uses to read the http response code, it fallbacks to retrying if this field is not set.But with protobuf encoding Details is not populated and loki retries 4xxs. I do not think it is necessary to set this.
httpgrpc.HTTPResponseFromErrorgets the Status from the error and additionally tries to decode the http response from Details field. But allretry.goneeds is the Code from Status field which would be set for both encoding formats, so replacing this call withstatus.FromError()which only pulls out the Status from error should fix the retry behaviour.references:
loki/pkg/querier/worker/util.go
Line 142 in 76a764b
loki/pkg/querier/queryrange/marshal.go
Line 208 in 76a764b
loki/pkg/querier/queryrange/codec.go
Line 667 in 76a764b
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Checklist
CONTRIBUTING.mdguide (required)featPRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.docs/sources/setup/upgrade/_index.mdproduction/helm/loki/Chart.yamland updateproduction/helm/loki/CHANGELOG.mdandproduction/helm/loki/README.md. Example PRdeprecated-config.yamlanddeleted-config.yamlfiles respectively in thetools/deprecated-config-checkerdirectory. Example PR