From 851839f7b81cd16a7fc9c5aa9acf3528be0912e8 Mon Sep 17 00:00:00 2001 From: Fiona Liao Date: Thu, 31 Oct 2024 16:32:10 +0000 Subject: [PATCH 1/2] Take ignoreCounterResets into account in requireEqualSeries Signed-off-by: Fiona Liao --- tsdb/testutil.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tsdb/testutil.go b/tsdb/testutil.go index 03587f4e2c..c39eb133c7 100644 --- a/tsdb/testutil.go +++ b/tsdb/testutil.go @@ -111,7 +111,11 @@ func requireEqualSeries(t *testing.T, expected, actual map[string][]chunks.Sampl for name, expectedItem := range expected { actualItem, ok := actual[name] require.True(t, ok, "Expected series %s not found", name) - requireEqualSamples(t, name, expectedItem, actualItem, requireEqualSamplesIgnoreCounterResets) + if ignoreCounterResets { + requireEqualSamples(t, name, expectedItem, actualItem, requireEqualSamplesIgnoreCounterResets) + } else { + requireEqualSamples(t, name, expectedItem, actualItem) + } } for name := range actual { _, ok := expected[name] From d04a6b833f10b521e17a68d9a325b4165d85a5f2 Mon Sep 17 00:00:00 2001 From: Fiona Liao Date: Thu, 31 Oct 2024 16:47:30 +0000 Subject: [PATCH 2/2] Fix test after counter reset logic change Signed-off-by: Fiona Liao --- tsdb/db_test.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tsdb/db_test.go b/tsdb/db_test.go index 5c329dac0c..db5146a68b 100644 --- a/tsdb/db_test.go +++ b/tsdb/db_test.go @@ -7039,9 +7039,8 @@ func TestOOOHistogramCompactionWithCounterResets(t *testing.T) { } series1ExpSamplesPostCompact = append(series1ExpSamplesPostCompact, s) } - // Counter reset. + // Counter reset, but set as unknown since the first sample of OOO chunks have UnknownCounterReset s = addSample(int64(490), series1, 100000, histogram.UnknownCounterReset) - s = copyWithCounterReset(s, histogram.CounterReset) series1ExpSamplesPreCompact = append(series1ExpSamplesPreCompact, s) series1ExpSamplesPostCompact = append(series1ExpSamplesPostCompact, s) // Add some more samples after the counter reset. @@ -7064,9 +7063,8 @@ func TestOOOHistogramCompactionWithCounterResets(t *testing.T) { } series2ExpSamplesPostCompact = append(series2ExpSamplesPostCompact, s) } - // Counter reset. + // Counter reset, but set as unknown since the first sample of OOO chunks have UnknownCounterReset s = addSample(int64(300), series2, 100000, histogram.UnknownCounterReset) - s = copyWithCounterReset(s, histogram.CounterReset) series2ExpSamplesPreCompact = append(series2ExpSamplesPreCompact, s) series2ExpSamplesPostCompact = append(series2ExpSamplesPostCompact, s) // Add some more samples after the counter reset.