Improve validation.LimitError usages #6954
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
duricanikolic
force-pushed
the
yuri/limit-errors
branch
2 times, most recently
from
6fca7b2
to
b85e37c
Compare
Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>
duricanikolic
force-pushed
the
yuri/limit-errors
branch
from
b85e37c
to
10cab1c
Compare
dimitarvdimitrov
approved these changes
Dec 19, 2023
pkg/distributor/query.go
Outdated
Comment on lines
337
to
339
| quorumConfig.IsTerminalError = func(err error) bool { | ||
| _, isLimitError := err.(validation.LimitError) | ||
| return isLimitError | ||
| return validation.IsLimitError(err) | ||
| } |
There was a problem hiding this comment.
can we do this?
quorumConfig.IsTerminalError = validaiton.IsLimitErrorThere was a problem hiding this comment.
Sure, will replace it. Thank you
Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.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.
What this PR does
This PR improves usages of
validation.LimitErrorerrors. It addresses the following problems found in the code:limiter.AddSeries(),limiter.AddChunkBytes(),limiter.AddChunks()andlimiter.AddEstimatedChunks()return an error of typevalidate.LimitError. In some cases, the caller of those functions used to wrap the returned error intovalidation.LimitError, although it was not necessary. In order to prevent this, the signature of the above mentioned methods has been changed fromfunc AddXyz(...) errortofunc AddXyz(...) validation.LimitError. This way we enforced that the only allowed errors returned by these functions are of typevalidation.LimitError.validation.LimitErroris now an interface, instead of a struct as it used to be.Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX].about-versioning.mdupdated with experimental features.