fixes race condition when deleting alertmanager, prometheus and thanosruler instances #5954
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
|
Thanks for the PR! For completeness can you share the operator's version where the issue happens? |
|
I've tested and experienced it on
|
pkg/alertmanager/operator.go
Outdated
| @@ -644,6 +644,11 @@ func (c *Operator) sync(ctx context.Context, key string) error { | |||
| return nil | |||
| } | |||
|
|
|||
| // Check if the Alertmanager instance is marked for deletion. | |||
There was a problem hiding this comment.
I'd suggest to get inspiration from the UpdateStatus() method and do the check at the very beginning of the function.
prometheus-operator/pkg/alertmanager/operator.go
Lines 782 to 789 in 535cd8c
There was a problem hiding this comment.
Thanks for your comment. I've added thanos and the agent, reused the DeletionInProgress function and moved the checks as high as possible.
pkg/prometheus/agent/operator.go
Outdated
|
|
||
| // Check if the Agent instance is marked for deletion. | ||
| if c.rr.DeletionInProgress(p) { | ||
| level.Info(logger).Log("msg", "the resource is deleting, not reconciling") |
There was a problem hiding this comment.
(nit) c.rr.DeletionInProgress already logs (though at debug level)
Suggested change
| level.Info(logger).Log("msg", "the resource is deleting, not reconciling") |
pkg/prometheus/server/operator.go
Outdated
| @@ -1166,6 +1166,12 @@ func (c *Operator) sync(ctx context.Context, key string) error { | |||
| logger := log.With(c.logger, "key", key) | |||
| logDeprecatedFields(logger, p) | |||
|
|
|||
| // Check if the Prometheus instance is marked for deletion. | |||
| if c.rr.DeletionInProgress(p) { | |||
| level.Info(logger).Log("msg", "the resource is deleting, not reconciling") | |||
There was a problem hiding this comment.
(nit) same
Suggested change
| level.Info(logger).Log("msg", "the resource is deleting, not reconciling") |
simonpasquier
changed the title
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.
Description
A race condition in appears when using Pulumi to delete a prometheus instance custom resouce from a Kubernetes cluster.
I've created a demo repo https://github.com/mheers/pulumi-prometheus-operator-race-condition to reproduce the behaviour.
Deleting the CR with pulumi will get the operator stuck in a loop. The operator will try to delete the prometheus instance but will fail with errors exported to https://github.com/mheers/pulumi-prometheus-operator-race-condition/blob/main/logs/operator.log
Type of change
CHANGE(fix or feature that would cause existing functionality to not work as expected)FEATURE(non-breaking change which adds functionality)BUGFIX(non-breaking change which fixes an issue)ENHANCEMENT(non-breaking change which improves existing functionality)NONE(if none of the other choices apply. Example, tooling, build system, CI, docs, etc.)Changelog entry