per tenant compactor backlogs

Signed-off-by: Yi Jin <[email protected]>
databricks · Dec 20, 2024 · 67565b9 · 67565b9
1 parent b480301
commit 67565b9
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/cmd/thanos/compact.go b/cmd/thanos/compact.go
@@ -462,6 +462,11 @@ func runCompact(
 	}
 
 	compactMainFn := func() error {
+		// this should happen before any compaction to remove unnecessary process on backlogs beyond retention.
+		if err := compact.ApplyRetentionPolicyByTenant(ctx, logger, insBkt, sy.Metas(), retentionByTenant, compactMetrics.blocksMarked.WithLabelValues(metadata.DeletionMarkFilename, metadata.TenantRetentionExpired)); err != nil {
+			return errors.Wrap(err, "retention by tenant failed")
+		}
+
 		if err := compactor.Compact(ctx); err != nil {
 			return errors.Wrap(err, "whole compaction error")
 		}
@@ -540,10 +545,6 @@ func runCompact(
 			return errors.Wrap(err, "sync before retention")
 		}
 
-		if err := compact.ApplyRetentionPolicyByTenant(ctx, logger, insBkt, sy.Metas(), retentionByTenant, compactMetrics.blocksMarked.WithLabelValues(metadata.DeletionMarkFilename, metadata.TenantRetentionExpired)); err != nil {
-			return errors.Wrap(err, "retention by tenant failed")
-		}
-
 		if err := compact.ApplyRetentionPolicyByResolution(ctx, logger, insBkt, sy.Metas(), retentionByResolution, compactMetrics.blocksMarked.WithLabelValues(metadata.DeletionMarkFilename, "")); err != nil {
 			return errors.Wrap(err, "retention failed")
 		}