[query-frontend] /active_series: cancel request context when write deadline is reached
#7569
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
flxbk
changed the title
/active_series: cancel request context when write deadline is reached
flxbk
force-pushed
the
felix/active-series-request-timeout
branch
from
16c1476
to
2567674
Compare
jhesketh
requested changes
Mar 8, 2024
| @@ -200,6 +201,9 @@ func (f *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { | |||
| writeError(w, apierror.New(apierror.TypeInternal, err.Error())) | |||
| return | |||
| } | |||
| ctx, _ := context.WithDeadlineCause(r.Context(), deadline, | |||
| cancellation.NewErrorf("write deadline exceeded (timeout: %v)", f.cfg.ActiveSeriesWriteTimeout)) | |||
There was a problem hiding this comment.
If ActiveSeriesWriteTimeout is set to 0 (meaning to use server.http-write-timeout), this will log incorrectly.
There was a problem hiding this comment.
This whole block is guarded by f.cfg.ActiveSeriesWriteTimeout > 0 though, so this code will not execute if the flag is set to 0, or am I missing something? 🤔
There was a problem hiding this comment.
Ah, yes, I was looking at the previous change and didn't pay enough attention here. Thanks!
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 is a follow-up to #7553. I realised that the request context is not cancelled when the server write deadline is reached (see e.g. here). To avoid doing unnecessary work we should cancel the request context once the deadline is reached.
This change only applies to the
/active_seriesendpoint, the behaviour for other endpoints remains unchanged.Which issue(s) this PR fixes or relates to
Fixes #
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX].about-versioning.mdupdated with experimental features.