diff --git a/modules/compactor/compactor.go b/modules/compactor/compactor.go index 559aa58a783..a762bb1ace8 100644 --- a/modules/compactor/compactor.go +++ b/modules/compactor/compactor.go @@ -254,8 +254,8 @@ func (c *Compactor) BlockRetentionForTenant(tenantID string) time.Duration { return c.overrides.BlockRetention(tenantID) } -// DisabledForTenant implements CompactorOverrides -func (c *Compactor) DisabledForTenant(tenantID string) bool { +// CompactionDisabledForTenant implements CompactorOverrides +func (c *Compactor) CompactionDisabledForTenant(tenantID string) bool { return c.overrides.CompactionDisabled(tenantID) } diff --git a/tempodb/compactor.go b/tempodb/compactor.go index cd43dafa8f1..7d9e71d5518 100644 --- a/tempodb/compactor.go +++ b/tempodb/compactor.go @@ -106,7 +106,7 @@ func (rw *readerWriter) doCompaction(ctx context.Context) { tenantID := tenants[rw.compactorTenantOffset] // Skip compaction for tenants which have it disabled. - if rw.compactorOverrides.DisabledForTenant(tenantID) { + if rw.compactorOverrides.CompactionDisabledForTenant(tenantID) { return } diff --git a/tempodb/compactor_test.go b/tempodb/compactor_test.go index 8e13952266c..83f00225626 100644 --- a/tempodb/compactor_test.go +++ b/tempodb/compactor_test.go @@ -57,7 +57,7 @@ func (m *mockOverrides) BlockRetentionForTenant(_ string) time.Duration { return m.blockRetention } -func (m *mockOverrides) DisabledForTenant(_ string) bool { +func (m *mockOverrides) CompactionDisabledForTenant(_ string) bool { return m.disabled } diff --git a/tempodb/tempodb.go b/tempodb/tempodb.go index a08b32e9665..c270a41c080 100644 --- a/tempodb/tempodb.go +++ b/tempodb/tempodb.go @@ -108,7 +108,7 @@ type CompactorSharder interface { type CompactorOverrides interface { BlockRetentionForTenant(tenantID string) time.Duration - DisabledForTenant(tenantID string) bool + CompactionDisabledForTenant(tenantID string) bool MaxBytesPerTraceForTenant(tenantID string) int MaxCompactionRangeForTenant(tenantID string) time.Duration }