Prepare for context argument changes in Prometheus #6097
Merged
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
8 tasks
aknuds1
commented
Sep 21, 2023
Prepare for context argument changes (some functions gain a context argument, while others lose it) in Prometheus, by adding a context argument to functions that will need it. Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1
force-pushed
the
arve/prepare-for-context
branch
from
ab87dc5
to
2a64b04
Compare
krajorama
reviewed
Sep 22, 2023
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
|
Thanks for the careful reviews @krajorama and @dimitarvdimitrov! |
dimitarvdimitrov
approved these changes
Sep 22, 2023
pracucci
reviewed
Sep 25, 2023
| @@ -830,7 +830,7 @@ func (i *Ingester) PushWithCleanup(ctx context.Context, pushReq *push.Request) ( | |||
| return &mimirpb.WriteResponse{}, nil | |||
| } | |||
|
|
|||
| db, err := i.getOrCreateTSDB(userID, false) | |||
| db, err := i.getOrCreateTSDB(ctx, userID, false) | |||
There was a problem hiding this comment.
We're passing the request context to getOrCreateTSDB(). I don't know what it will be used for, but if the context will be retained by TSDB then I think this is a mistake. We shouldn't pass any request-specific context to any place where the context will be retained.
There was a problem hiding this comment.
Thanks for the feedback @pracucci. The context shouldn't be retained, but I'm looking into whether it's a bad idea to pass it down into TSDB.
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
Prepare for context argument changes (some functions gain a context argument, while others lose it) in Prometheus, by adding a context argument to functions that will need it.
This PR should cause no behavioral changes, it is only supposed to reduce the number of changes required for updating our Prometheus dependency.
Which issue(s) this PR fixes or relates to
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]