From c3c838bbac08ccb492aef78b5f0c1d218d54a226 Mon Sep 17 00:00:00 2001 From: Fiona Liao Date: Fri, 11 Oct 2024 16:51:39 +0100 Subject: [PATCH 1/2] Increase block-ranges-period for OOO native histogram integration test --- integration/ooo_ingestion_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/integration/ooo_ingestion_test.go b/integration/ooo_ingestion_test.go index a7dc50e432b..65caf65be61 100644 --- a/integration/ooo_ingestion_test.go +++ b/integration/ooo_ingestion_test.go @@ -168,6 +168,12 @@ func TestOOOHistogramIngestionDisabled(t *testing.T) { map[string]string{ "-ingester.out-of-order-time-window": "10m", "-ingester.native-histograms-ingestion-enabled": "true", + // Default block-ranges-period for integration tests is 1m + // When OOO NH is disabled, all NH samples must be greater than or equal to minValidTime, otherwise an out + // of bounds error is returned. minValidTime which max sample time - (block-ranges-period[0]/2). Increase + // tsdb.block-ranges-period to 2h so when we ingest 1m OOO data, the out of bounds check passes and we hit + // the specific OOO NH disabled error instead. + "-blocks-storage.tsdb.block-ranges-period": "2h", }, ) From aeb921c607493208bd9ae8d68f267dc448584c1e Mon Sep 17 00:00:00 2001 From: Fiona Liao Date: Tue, 15 Oct 2024 11:55:06 +0100 Subject: [PATCH 2/2] Explicitly disable OOO NH in test --- integration/ooo_ingestion_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/integration/ooo_ingestion_test.go b/integration/ooo_ingestion_test.go index 65caf65be61..4e54e1d97c2 100644 --- a/integration/ooo_ingestion_test.go +++ b/integration/ooo_ingestion_test.go @@ -166,8 +166,9 @@ func TestOOOHistogramIngestionDisabled(t *testing.T) { BlocksStorageFlags(), BlocksStorageS3Flags(), map[string]string{ - "-ingester.out-of-order-time-window": "10m", - "-ingester.native-histograms-ingestion-enabled": "true", + "-ingester.out-of-order-time-window": "10m", + "-ingester.native-histograms-ingestion-enabled": "true", + "-ingester.ooo-native-histograms-ingestion-enabled": "false", // Default block-ranges-period for integration tests is 1m // When OOO NH is disabled, all NH samples must be greater than or equal to minValidTime, otherwise an out // of bounds error is returned. minValidTime which max sample time - (block-ranges-period[0]/2). Increase