Skip to content

Commit 94d5ee4

Browse files
fix(blooms): Skip multi-tenant TSDBs during bloom planning (#14770)
(cherry picked from commit 76d35cc)
1 parent d10f79c commit 94d5ee4

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

pkg/bloombuild/planner/planner.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,6 @@ func (p *Planner) computeTasks(
405405
// Resolve TSDBs
406406
tsdbs, err := p.tsdbStore.ResolveTSDBs(ctx, table, tenant)
407407
if err != nil {
408-
level.Error(logger).Log("msg", "failed to resolve tsdbs", "err", err)
409408
return nil, nil, fmt.Errorf("failed to resolve tsdbs: %w", err)
410409
}
411410

@@ -664,9 +663,14 @@ func (p *Planner) loadTenantTables(
664663
}
665664

666665
for tenants.Next() && tenants.Err() == nil && ctx.Err() == nil {
667-
p.metrics.tenantsDiscovered.Inc()
668666
tenant := tenants.At()
667+
if tenant == "" {
668+
// Tables that have not been fully compacted yet will have multi-tenant TSDBs for which the tenant is ""
669+
// in this case we just skip the tenant
670+
continue
671+
}
669672

673+
p.metrics.tenantsDiscovered.Inc()
670674
if !p.limits.BloomCreationEnabled(tenant) {
671675
level.Debug(p.logger).Log("msg", "bloom creation disabled for tenant", "tenant", tenant)
672676
continue

0 commit comments

Comments
 (0)