From a08d04b35d11f59805aff042d60ca9e5066367a1 Mon Sep 17 00:00:00 2001 From: Bartek Plotka Date: Thu, 10 Oct 2019 11:45:04 +0100 Subject: [PATCH] Added back deletion of the downsampling dir. Signed-off-by: Bartek Plotka --- cmd/thanos/compact.go | 5 +++++ cmd/thanos/main_test.go | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/thanos/compact.go b/cmd/thanos/compact.go index 7e5c272a279..12f6573a0e2 100644 --- a/cmd/thanos/compact.go +++ b/cmd/thanos/compact.go @@ -236,6 +236,11 @@ func runCompact( indexCacheDir = path.Join(dataDir, "index_cache") ) + if err := os.RemoveAll(downsamplingDir); err != nil { + cancel() + return errors.Wrap(err, "clean working downsample directory") + } + compactor, err := compact.NewBucketCompactor(logger, sy, comp, compactDir, bkt, concurrency) if err != nil { cancel() diff --git a/cmd/thanos/main_test.go b/cmd/thanos/main_test.go index 01a7ee7a1a2..138ce525791 100644 --- a/cmd/thanos/main_test.go +++ b/cmd/thanos/main_test.go @@ -27,7 +27,7 @@ func TestCleanupCompactCacheFolder(t *testing.T) { ctx, logger, dir, _, bkt, actReg := bootstrap(t) defer func() { testutil.Ok(t, os.RemoveAll(dir)) }() - sy, err := compact.NewSyncer(logger, actReg, bkt, 0*time.Second, 1, false) + sy, err := compact.NewSyncer(logger, actReg, bkt, 0*time.Second, 1, false, nil) testutil.Ok(t, err) expReg := prometheus.NewRegistry()