Added back deletion of the downsampling dir.

Signed-off-by: Bartek Plotka <[email protected]>
thanos-io · Oct 10, 2019 · a08d04b · a08d04b
1 parent 13c916f
commit a08d04b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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()