fix panic in compactor when retention is not enabled (#3966)

grafana · Jul 8, 2021 · ae3e499 · ae3e499
1 parent bee4567
commit ae3e499
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/pkg/storage/stores/shipper/compactor/compactor.go b/pkg/storage/stores/shipper/compactor/compactor.go
@@ -216,15 +216,17 @@ func (c *Compactor) RunCompaction(ctx context.Context) error {
 
 	defer func() {
 		c.metrics.compactTablesOperationTotal.WithLabelValues(status).Inc()
-		dmCallback := c.expirationChecker.MarkPhaseFailed
 		if status == statusSuccess {
-			dmCallback = c.expirationChecker.MarkPhaseFinished
 			c.metrics.compactTablesOperationDurationSeconds.Set(time.Since(start).Seconds())
 			c.metrics.compactTablesOperationLastSuccess.SetToCurrentTime()
 		}
 
 		if c.cfg.RetentionEnabled {
-			dmCallback()
+			if status == statusSuccess {
+				c.expirationChecker.MarkPhaseFinished()
+			} else {
+				c.expirationChecker.MarkPhaseFailed()
+			}
 		}
 	}()