Fix query sharding with too many requests error #2447
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
bboreham
reviewed
Jul 18, 2022
| @@ -438,3 +441,8 @@ func decorateWithParamName(err error, field string) error { | |||
| } | |||
| return apierror.Newf(apierror.TypeBadData, errTmpl, field, err) | |||
| } | |||
|
|
|||
| func mustReadAll(r io.Reader) []byte { | |||
| body, _ := ioutil.ReadAll(r) | |||
There was a problem hiding this comment.
could this use bodyBuffer(r), which DecodeResponse() calls on the non-error case ?
There was a problem hiding this comment.
I don't think it's needed now, but it will definitely leave a more robust code, so replaced it here: a44e91b
Thanks.
integration/query_frontend_test.go
Outdated
| require.NoError(t, distributor.WaitSumMetrics(e2e.Equals(512+1), "cortex_ring_tokens_total")) | ||
| require.NoError(t, querier.WaitSumMetrics(e2e.Equals(512), "cortex_ring_tokens_total")) | ||
|
|
||
| // Push a series for each user to Mimir. |
There was a problem hiding this comment.
"for each user" doesn't seem to match the code?
There was a problem hiding this comment.
Too much copy-paste, fixed 0a80fdf
integration/query_frontend_test.go
Outdated
| } | ||
|
|
||
| func TestQueryFrontendWithQueryShardingAndTooManyRequests(t *testing.T) { | ||
| runQueryFrontendWithQueryShardingAndTooManyRequestsTest := func(t *testing.T, cfg queryFrontendTestConfig) { |
There was a problem hiding this comment.
Making this a local func pushes indenting out; is it worth it?
There was a problem hiding this comment.
I don't have a strong opinion on this, so extracted: 85b9d95
treid314
approved these changes
Jul 18, 2022
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
When using a local queue, the v1.Frontend responds with an httpgrpc.Error when the queue is full. We need to convert that into a 429 http response instead of failing to roundtripping. Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
This will let us reuse the body if needed in the future. Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
colega
force-pushed
the
fix-query-sharding-with-too-many-requests-error
branch
from
a44e91b to
a7bed6e
Compare
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
Handles the 429 status code when query sharding uses the prometheus codec.
Which issue(s) this PR fixes or relates to
Fixes #2169
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]