-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Preserve reset hint during histogram deduplication #7092
Open
fpetkovski
wants to merge
3
commits into
thanos-io:main
Choose a base branch
from
fpetkovski:dedup-histogram-reset
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
// Copyright (c) The Thanos Authors. | ||
// Licensed under the Apache License 2.0. | ||
|
||
package query | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/efficientgo/core/testutil" | ||
"github.com/prometheus/prometheus/model/histogram" | ||
"github.com/prometheus/prometheus/tsdb/tsdbutil" | ||
) | ||
|
||
func TestNativeHistogramDedup(t *testing.T) { | ||
cases := []struct { | ||
samples []sample | ||
tcase string | ||
}{ | ||
{ | ||
tcase: "unknown counter reset chunk", | ||
samples: []sample{ | ||
{t: 10000, h: makeHistWithHint(1, histogram.UnknownCounterReset)}, | ||
{t: 20000, h: makeHistWithHint(2, histogram.UnknownCounterReset)}, | ||
}, | ||
}, | ||
{ | ||
tcase: "not counter reset chunk", | ||
samples: []sample{ | ||
{t: 10000, h: makeHistWithHint(1, histogram.NotCounterReset)}, | ||
{t: 20000, h: makeHistWithHint(2, histogram.NotCounterReset)}, | ||
}, | ||
}, | ||
{ | ||
tcase: "counter reset chunk", | ||
samples: []sample{ | ||
{t: 10000, h: makeHistWithHint(1, histogram.CounterReset)}, | ||
{t: 20000, h: makeHistWithHint(2, histogram.NotCounterReset)}, | ||
}, | ||
}, | ||
} | ||
|
||
for _, c := range cases { | ||
t.Run(c.tcase, func(t *testing.T) { | ||
// When the first sample is read, the counter reset hint for the second sample | ||
// does not need to be reset. | ||
t.Run("read_first_sample", func(t *testing.T) { | ||
it := newHistogramResetDetector(newMockedSeriesIterator(c.samples)) | ||
it.Next() | ||
_, h := it.AtHistogram(nil) | ||
testutil.Equals(t, c.samples[0].h.CounterResetHint, h.CounterResetHint) | ||
|
||
it.Next() | ||
_, h = it.AtHistogram(nil) | ||
testutil.Equals(t, c.samples[1].h.CounterResetHint, h.CounterResetHint) | ||
}) | ||
|
||
// When the first sample is not read, the counter reset hint for the second | ||
// sample should be reset. | ||
t.Run("skip_first_sample", func(t *testing.T) { | ||
it := newHistogramResetDetector(newMockedSeriesIterator(c.samples)) | ||
it.Next() | ||
it.Next() | ||
_, h := it.AtHistogram(nil) | ||
testutil.Equals(t, h.CounterResetHint, histogram.UnknownCounterReset) | ||
}) | ||
}) | ||
} | ||
} | ||
|
||
func makeHistWithHint(i int, hint histogram.CounterResetHint) *histogram.Histogram { | ||
h := tsdbutil.GenerateTestHistogram(i) | ||
h.CounterResetHint = hint | ||
return h | ||
} |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see the only purpose of this is to check whether Next() has been called? Maybe we could convert it into a simple boolean? Otherwise this might overflow.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The variable tracks whether we are at the first sample. We could use a boolean pointer because we need to represent 3 states, one being
Next
not being called at all. AFAIK a chunk has 120 samples so we should not have a risk of overflow, and even if it does the side-effect will be that we recalculate a reset one more time in the engine.