From 64215e18495b12e6d5565eba6fe54bc381ac7189 Mon Sep 17 00:00:00 2001 From: Christian Haudum Date: Tue, 23 Jul 2024 11:25:46 +0200 Subject: [PATCH] fix(blooms): Cleanup temp blockdir in bloom compactor (#13622) A follow up to #13522 This PR fixes the missing cleanup function call to remove temporary blocks from the filesystem. Signed-off-by: Christian Haudum --- pkg/bloomcompactor/controller.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkg/bloomcompactor/controller.go b/pkg/bloomcompactor/controller.go index b852896bfd..d53ba80b01 100644 --- a/pkg/bloomcompactor/controller.go +++ b/pkg/bloomcompactor/controller.go @@ -431,6 +431,9 @@ func (s *SimpleBloomController) buildGaps( built, err := bloomshipper.BlockFrom(tenant, table.Addr(), blk) if err != nil { level.Error(logger).Log("msg", "failed to build block", "err", err) + if err = blk.Reader().Cleanup(); err != nil { + level.Error(logger).Log("msg", "failed to cleanup block directory", "err", err) + } return nil, errors.Wrap(err, "failed to build block") } @@ -439,10 +442,17 @@ func (s *SimpleBloomController) buildGaps( built, ); err != nil { level.Error(logger).Log("msg", "failed to write block", "err", err) + if err = blk.Reader().Cleanup(); err != nil { + level.Error(logger).Log("msg", "failed to cleanup block directory", "err", err) + } return nil, errors.Wrap(err, "failed to write block") } s.metrics.blocksCreated.Inc() + if err := blk.Reader().Cleanup(); err != nil { + level.Error(logger).Log("msg", "failed to cleanup block directory", "err", err) + } + totalGapKeyspace := (gap.bounds.Max - gap.bounds.Min) progress := (built.Bounds.Max - gap.bounds.Min) pct := float64(progress) / float64(totalGapKeyspace) * 100