lint

Signed-off-by: Ben Ye <[email protected]>

cmd/thanos/store.go

@@ -125,7 +125,7 @@ func (sc *storeConfig) registerFlag(cmd extkingpin.FlagClause) {
 		Default("32").IntVar(&sc.blockMetaFetchConcurrency)
 
 	cmd.Flag("sync-tombstone-duration", "Repeat interval for syncing the tombstones between local and remote view.").
-		Default("3m").DurationVar(&sc.syncInterval)
+		Default("3m").DurationVar(&sc.syncTombstonesInterval)
 
 	sc.filterConf = &store.FilterConfig{}
 
@@ -407,7 +407,7 @@ func runStore(
 
 	{
 		g.Add(func() error {
-			return runutil.Repeat(time.Minute*3, ctx.Done(), func() error {
+			return runutil.Repeat(conf.syncTombstonesInterval, ctx.Done(), func() error {
 				return bs.SyncTombstones(ctx)
 			})
 		}, func(error) {

cmd/thanos/tools_bucket.go

@@ -9,7 +9,6 @@ import (
 	"encoding/csv"
 	"encoding/json"
 	"fmt"
-	"github.com/thanos-io/thanos/pkg/block/tombstone"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -46,6 +45,7 @@ import (
 	v1 "github.com/thanos-io/thanos/pkg/api/blocks"
 	"github.com/thanos-io/thanos/pkg/block"
 	"github.com/thanos-io/thanos/pkg/block/metadata"
+	"github.com/thanos-io/thanos/pkg/block/tombstone"
 	"github.com/thanos-io/thanos/pkg/compact"
 	"github.com/thanos-io/thanos/pkg/compact/downsample"
 	"github.com/thanos-io/thanos/pkg/compactv2"

pkg/block/tombstone/tombstone.go

@@ -12,7 +12,7 @@ import (
 	"path"
 	"time"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/oklog/ulid"
 	"github.com/prometheus/prometheus/model/timestamp"
 

pkg/compact/compact.go

@@ -1015,6 +1015,9 @@ func (cg *Group) compact(ctx context.Context, dir string, planner Planner, comp
 		if err != nil {
 			return false, ulid.ULID{}, retry(errors.Wrapf(err, "download block %s", meta.ULID))
 		}
+		bb, err := tsdb.OpenBlock()
+		bb.Delete()
+		bb.CleanTombstones()
 
 		// Ensure all input blocks are valid.
 		var stats block.HealthStats