Query-frontend: don't retry queries which error inside PromQL #4643
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
56quarters
approved these changes
Mar 31, 2023
So it can be mocked for testing.
Cancellations would get caught at the top of the loop, but it's better to skip the error log line.
bboreham
force-pushed
the
dont-retry-bad-data
branch
from
4b078d2
to
7b14ec6
Compare
|
The change to not log "context canceled" as an error in the querier actually broke query-frontend, so I have removed it from this PR and moved to #4648. |
colega
reviewed
Apr 3, 2023
| util_log "github.com/grafana/mimir/pkg/util/log" | ||
| ) | ||
|
|
||
| type intObservation interface { |
There was a problem hiding this comment.
Nit, but should be:
Suggested change
| type intObservation interface { | |
| type intObserver interface { |
colega
reviewed
Apr 3, 2023
| type retryMiddlewareMetrics struct { | ||
| retriesCount prometheus.Histogram | ||
| } | ||
|
|
||
| func newRetryMiddlewareMetrics(registerer prometheus.Registerer) *retryMiddlewareMetrics { | ||
| func newRetryMiddlewareMetrics(registerer prometheus.Registerer) intObservation { |
There was a problem hiding this comment.
I don't see the value in this, I think we could perfectly use prometheus.Observer inteface and call float64 casting in all (1?) places.
colega
reviewed
Apr 3, 2023
|
@colega I have changed as you suggested. |
colega
reviewed
Apr 5, 2023
colega
approved these changes
Apr 5, 2023
colega
reviewed
Apr 5, 2023
Co-authored-by: Oleg Zaytsev <mail@olegzaytsev.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
Break out of the retry loop if the error has been decoded from a Prometheus error, or is a cancellation.
Extra drive-by fix: don't log "context canceled" as an error in the querier. This is noticeable when runningTestQueryFrontendErrorMessageParity/query_time_range_exceeds_the_limit, for instance.Which issue(s) this PR fixes or relates to
Fixes #4637
Checklist
CHANGELOG.mdupdated