sidecar: set to not ready when failing to fetch prometheus version #7291
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
Signed-off-by: Samuel Scard <10246309+SamJamS@users.noreply.github.com>
Signed-off-by: Samuel Scard <10246309+SamJamS@users.noreply.github.com>
SamJamS
commented
Apr 20, 2024
|
|
||
| // Start sidecar without ever starting Prometheus. | ||
| _, sidecar := e2ethanos.NewPrometheusWithSidecar(e, "alone", e2ethanos.DefaultPromConfig("prom-alone", 0, "", "", e2ethanos.LocalPrometheusTarget), "", e2ethanos.DefaultPrometheusImage(), "") | ||
| testutil.Ok(t, sidecar.Start()) |
There was a problem hiding this comment.
maybe use e2e.StartAndWaitReady() here, relying on sidecar's health endpoint as readiness check to make sure we have a running sidecar before testing?
SamJamS
commented
Apr 20, 2024
| @@ -189,6 +189,8 @@ func runSidecar( | |||
| "msg", "failed to fetch prometheus version. Is Prometheus running? Retrying", | |||
| "err", err, | |||
| ) | |||
| promUp.Set(0) | |||
| statusProber.NotReady(err) | |||
There was a problem hiding this comment.
Can update here or default readiness to false at the beginning of runSidecar()
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.
Changes
Update ready state in "fetch prometheus version" loop - Currently, if no ready Prometheus behind sidecar then this loops indefinitely and never sets sidecar as
not ready. As a result, sidecar reports asreadyif it starts up and there is not a running Prometheus behind it.Verification