-
Notifications
You must be signed in to change notification settings - Fork 3.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(retry): fix retries when using protobuf encoding #13316
Conversation
@@ -89,8 +89,8 @@ func (r retry) Do(ctx context.Context, req Request) (Response, error) { | |||
} | |||
|
|||
// 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) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
This PR must be merged before a backport PR will be created. |
1 similar comment
This PR must be merged before a backport PR will be created. |
(cherry picked from commit a457c5d)
What this PR does / why we need it:
retry.go
expects 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.HTTPResponseFromError
gets the Status from the error and additionally tries to decode the http response from Details field. But allretry.go
needs 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.md
guide (required)feat
PRs 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.md
production/helm/loki/Chart.yaml
and updateproduction/helm/loki/CHANGELOG.md
andproduction/helm/loki/README.md
. Example PRdeprecated-config.yaml
anddeleted-config.yaml
files respectively in thetools/deprecated-config-checker
directory. Example PR