Don't track as error an HA tracker CAS operation intentionally aborted #3745
Conversation
This file contains hidden or 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: Marco Pracucci <marco@pracucci.com>
pracucci
commented
Jan 26, 2021
|
|
||
| // GetSumOfHistogramSampleCount returns the sum of samples count of histograms matching the provided metric name | ||
| // and optional label matchers. Returns 0 if no metric matches. | ||
| func GetSumOfHistogramSampleCount(families []*dto.MetricFamily, metricName string, matchers labels.Selector) uint64 { |
There was a problem hiding this comment.
In the unit tests I've added in the distributor I couldn't use the typical testutil.GatherAndCompare() because the histogram tracks the request duration (which is unpredictable). Since we don't have a way to just test the histogram sample count, I've introduced this function to easy it (and future tests too).
pstibrany
approved these changes
Jan 26, 2021
|
@gouthamve I'm of the opinion it should be brought into the 1.7.0 branch. |
khaines
pushed a commit
that referenced
this pull request
Jan 26, 2021
#3745) Signed-off-by: Marco Pracucci <marco@pracucci.com> Signed-off-by: Ken Haines <khaines@microsoft.com>
|
#3746 - adds this change to the 1.7 Branch |
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:
The PR #3668 introduced a little regression causing intentionally aborted CAS operations (by HA tracker) to be tracked as
500in thecortex_kv_request_duration_secondsmetric instead of200. The reason of this subtle bug is in the introduction ofreplicasNotMatchError(which can be returned by theCAS()operation function), while the previous version was returning ahttpgrpc.Errorf(http.StatusAccepted)which is correctly converted into a200error code bypkg/ring/kv/metrics.go.Which issue(s) this PR fixes:
N/A
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]