sidecar: not ready when Prometheus is unavailable #4939
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
Set Sidecar to not be ready when Prometheus is unavailable. This avoids problems when Prometheus is replaying WAL and Sidecar is "up" but then Query hangs while waiting for a response from Prometheus/Sidecar. Also, it gets shown as UP in the Stores page with no ext. labels during this time that is confusing. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
GiedriusS
force-pushed
the
set_not_ready_when_err
branch
from
0c6f0fd
to
febb55c
Compare
Namanl2001
reviewed
Dec 11, 2021
| defer runutil.CloseWithErrCapture(&rerr, resp.Body, "closing resp body") | ||
|
|
||
| if resp.StatusCode == 200 { | ||
| return fmt.Errorf("got status code %d", resp.StatusCode) |
There was a problem hiding this comment.
Suggested change
| return fmt.Errorf("got status code %d", resp.StatusCode) | |
| return fmt.Errorf("sidecar should not be ready, got HTTP status code %d OK", resp.StatusCode) |
There was a problem hiding this comment.
Because that's what usually goes after 200 in the HTTP response https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/200? (:
There was a problem hiding this comment.
Because that's what usually goes after
200in the HTTP response https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/200? (:
yes, in case someone doesn't know what status code 200 signifies.
There was a problem hiding this comment.
Printing the status code and OK the same time seems redundant.
There was a problem hiding this comment.
So, can we merge this then @yeya24 ?
philipgough
pushed a commit
to philipgough/thanos
that referenced
this pull request
Dec 15, 2021
Signed-off-by: Philip Gough <philip.p.gough@gmail.com>
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
Set Sidecar to not be ready when Prometheus is unavailable. This avoids
problems when Prometheus is replaying WAL and Sidecar is "up" but then
Query hangs while waiting for a response from Prometheus/Sidecar. Also,
it gets shown as UP in the Stores page with no ext. labels during this
time that is confusing.
Verification
Improved e2e tests which pass.