Don't propagate cancel signal to the Prometheus rules manager context #6326
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
dosubot
bot
added
the
component/rules
alanprot
reviewed
Nov 8, 2024
| @@ -341,11 +341,15 @@ func DefaultTenantManagerFactory(cfg Config, p Pusher, q storage.Queryable, engi | |||
| queryFunc = metricsQueryFunc | |||
| } | |||
|
|
|||
| // We let the Prometheus rules manager control the context so that there is a chance | |||
| // for graceful shutdown of rules that are still in execution even in case the cortex context is canceled. | |||
| prometheusContext := user.InjectOrgID(context.WithoutCancel(ctx), userID) | |||
There was a problem hiding this comment.
this was added in go1.21.0
|
LGTM! |
alanprot
approved these changes
Nov 8, 2024
This change allows the rules that are still executing queries to complete before cortex if sully shutdown. Signed-off-by: Raphael Silva <[email protected]>
rapphil
force-pushed
the
rapphil-avoid-context-cancelation-ruler
branch
from
65bc9e8 to
6f53f67
Compare
Signed-off-by: Raphael Silva <[email protected]>
Use atomic counter to keep track of the successful queries Signed-off-by: Raphael Silva <[email protected]>
rapphil
force-pushed
the
rapphil-avoid-context-cancelation-ruler
branch
from
69a93db to
bd038d5
Compare
yeya24
approved these changes
Nov 9, 2024
CharlieTLe
pushed a commit
to CharlieTLe/cortex
that referenced
this pull request
Dec 3, 2024
…cortexproject#6326) * Don't propagate cancel signal to the Prometheus rules manager context This change allows the rules that are still executing queries to complete before cortex if sully shutdown. Signed-off-by: Raphael Silva <[email protected]> * Make ruler unit tests to run faster Signed-off-by: Raphael Silva <[email protected]> * Avoid tests to fail due to race condition Use atomic counter to keep track of the successful queries Signed-off-by: Raphael Silva <[email protected]> --------- Signed-off-by: Raphael Silva <[email protected]>
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 done by removing the cancel signal of the context passed to the Prometheus rules manager. Instead we are going to rely on the shutdown mechanism of the rules manager and timeout of the queries executed by the rules.
In the unit tests I tried to avoid adding sleeps and instead used channels to coordinate the execution of the queries to simulate the problem.
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]