Replace validation error with error in query limiter #4240
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
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
pracucci
approved these changes
Jun 1, 2021
…ntained string Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
treid314
commented
Jun 1, 2021
| _, err = c.QueryRange("{__name__=~\"series_.+\"}", series1Timestamp, series4Timestamp.Add(1*time.Hour), blockRangePeriod) | ||
| require.Error(t, err) | ||
| assert.Contains(t, err.Error(), "max number of series limit") | ||
| assert.Contains(t, err.Error(), "500") |
There was a problem hiding this comment.
For some reason after this change, err.Error() is returning encoded strings rather than plain strings, so the assert contains no longer works. Instead of checking the response string, I checked for 500 like we do in some other tests. Is there a better way to do this?
There was a problem hiding this comment.
This is not correct. We do not expect a 500 error if the limit is reached, but a 4xx error.
There was a problem hiding this comment.
Oh :( You're right. My bad for overlooking that.
pracucci
added a commit
to pracucci/cortex
that referenced
this pull request
Jun 3, 2021
Signed-off-by: Marco Pracucci <marco@pracucci.com>
3 tasks
pracucci
added a commit
that referenced
this pull request
Jun 3, 2021
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.
Signed-off-by: Tyler Reid tyler.reid@grafana.com
What this PR does:
This is an internal refactor to return an Error from the query limiter and wrap to be returned as a validation error in the ingester and blocks storage queryables.
Which issue(s) this PR fixes:
Fixes comments from PR #4216
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]