Distributor: replace ring.DoBatch with ring.DoBatchWithClientError #6636
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 updates vendored
dskit
to revision 0ae8e2e7 and replaces the usage ofring.DoBatch()
indistributor.push()
withring.DoBatchWithClientError()
. One of the parameters of the latter is a classification function that distinguishes between client and server errors. In the case of distributor, the classification is done by the newly introduceddistributor.isClientError()
function that treats the following errors returned byingester.Push()
as client errors:ingesterPushError
witherrorCause == mimirpb.BAD_DATA
, andhttpgrpc.Errorf()
, with status code4xx
(this is needed for backwards compatibility, and will be removed in mimir 2.12.0.Which issue(s) this PR fixes or relates to
Part of #6008
Checklist
CHANGELOG.md
updated - the order of entries should be[CHANGE]
,[FEATURE]
,[ENHANCEMENT]
,[BUGFIX]