Skip to content

Commit cd2a035

Browse files
authored
Ingester: Always upload compacted blocks (#5625)
* always upload compacted blocks Signed-off-by: Ben Ye <benye@amazon.com> * changelog Signed-off-by: Ben Ye <benye@amazon.com> --------- Signed-off-by: Ben Ye <benye@amazon.com>
1 parent 1dfd5f9 commit cd2a035

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
* [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
3030
* [CHANGE] Query Frontend/Querier: Make build info API disabled by default and add feature flag `api.build-info-enabled` to enable it. #5533
3131
* [CHANGE] Purger: Do no use S3 tenant kms key when uploading deletion marker. #5575
32+
* [CHANGE] Ingester: Shipper always upload compacted blocks. #5625
3233
* [FEATURE] Store Gateway: Add `max_downloaded_bytes_per_request` to limit max bytes to download per store gateway request.
3334
* [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
3435
* [FEATURE] Query Frontend: Add `cortex_rejected_queries_total` metric for throttled queries. #5356

pkg/ingester/ingester.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2044,7 +2044,9 @@ func (i *Ingester) createTSDB(userID string) (*userTSDB, error) {
20442044
func() labels.Labels { return l },
20452045
metadata.ReceiveSource,
20462046
func() bool {
2047-
return oooTimeWindow > 0 // Upload compacted blocks when OOO is enabled.
2047+
// Allow uploading compacted blocks. It is fine since compacted
2048+
// blocks should only happen when OOO is enabled in ingester.
2049+
return true
20482050
},
20492051
true, // Allow out of order uploads. It's fine in Cortex's context.
20502052
metadata.NoneFunc,

0 commit comments

Comments
 (0)