From cd2a03566982d6a2e69a95e1592ae04545a1cef8 Mon Sep 17 00:00:00 2001 From: Ben Ye Date: Tue, 31 Oct 2023 10:44:47 -0700 Subject: [PATCH] Ingester: Always upload compacted blocks (#5625) * always upload compacted blocks Signed-off-by: Ben Ye * changelog Signed-off-by: Ben Ye --------- Signed-off-by: Ben Ye --- CHANGELOG.md | 1 + pkg/ingester/ingester.go | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55348abae9..43b252be2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ * [CHANGE] StoreGateway: Rename `cortex_bucket_store_chunk_pool_returned_bytes_total` and `cortex_bucket_store_chunk_pool_requested_bytes_total` to `cortex_bucket_store_chunk_pool_operation_bytes_total`. #5552 * [CHANGE] Query Frontend/Querier: Make build info API disabled by default and add feature flag `api.build-info-enabled` to enable it. #5533 * [CHANGE] Purger: Do no use S3 tenant kms key when uploading deletion marker. #5575 +* [CHANGE] Ingester: Shipper always upload compacted blocks. #5625 * [FEATURE] Store Gateway: Add `max_downloaded_bytes_per_request` to limit max bytes to download per store gateway request. * [FEATURE] Added 2 flags `-alertmanager.alertmanager-client.grpc-max-send-msg-size` and ` -alertmanager.alertmanager-client.grpc-max-recv-msg-size` to configure alert manager grpc client message size limits. #5338 * [FEATURE] Query Frontend: Add `cortex_rejected_queries_total` metric for throttled queries. #5356 diff --git a/pkg/ingester/ingester.go b/pkg/ingester/ingester.go index 96d8df52f7..f0394b814e 100644 --- a/pkg/ingester/ingester.go +++ b/pkg/ingester/ingester.go @@ -2044,7 +2044,9 @@ func (i *Ingester) createTSDB(userID string) (*userTSDB, error) { func() labels.Labels { return l }, metadata.ReceiveSource, func() bool { - return oooTimeWindow > 0 // Upload compacted blocks when OOO is enabled. + // Allow uploading compacted blocks. It is fine since compacted + // blocks should only happen when OOO is enabled in ingester. + return true }, true, // Allow out of order uploads. It's fine in Cortex's context. metadata.NoneFunc,