Fix/validate compactor config

pkg/logql/error.go

@@ -3,9 +3,9 @@ package logql
 import (
 	"fmt"
 
-	"github.com/grafana/loki/pkg/logql/log"
-
 	"github.com/prometheus/prometheus/pkg/labels"
+
+	"github.com/grafana/loki/pkg/logql/log"
 )
 
 // ParseError is what is returned when we failed to parse.

pkg/storage/store_test.go

@@ -857,6 +857,7 @@ func TestStore_MultipleBoltDBShippersInConfig(t *testing.T) {
 		cortex_util.Logger,
 	)
 	require.NoError(t, err)
+
 	store, err = NewStore(config, schemaConfig, chunkStore, nil)
 	require.NoError(t, err)
 

pkg/storage/stores/shipper/compactor/compactor.go

@@ -2,8 +2,10 @@ package compactor
 
 import (
 	"context"
+	"errors"
 	"flag"
 	"path/filepath"
+	"reflect"
 	"strings"
 	"time"
 
@@ -34,6 +36,12 @@ func (cfg *Config) RegisterFlags(f *flag.FlagSet) {
 	f.DurationVar(&cfg.CompactionInterval, "boltdb.shipper.compactor.compaction-interval", 2*time.Hour, "Interval at which to re-run the compaction operation.")
 }
 
+func (cfg *Config) IsDefaults() bool {
+	cpy := &Config{}
+	cpy.RegisterFlags(flag.NewFlagSet("defaults", flag.ContinueOnError))
+	return reflect.DeepEqual(cfg, cpy)
+}
+
 type Compactor struct {
 	services.Service
 
@@ -44,6 +52,10 @@ type Compactor struct {
 }
 
 func NewCompactor(cfg Config, storageConfig storage.Config, r prometheus.Registerer) (*Compactor, error) {
+	if cfg.IsDefaults() {
+		return nil, errors.New("Must specify compactor config")
+	}
+
 	objectClient, err := storage.NewObjectClient(cfg.SharedStoreType, storageConfig)
 	if err != nil {
 		return nil, err

pkg/storage/stores/shipper/compactor/compactor_test.go

@@ -0,0 +1,28 @@
+package compactor
+
+import (
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestIsDefaults(t *testing.T) {
+	for i, tc := range []struct {
+		in  *Config
+		out bool
+	}{
+		{&Config{
+			WorkingDirectory: "/tmp",
+		}, false},
+		{&Config{}, false},
+		{&Config{
+			CompactionInterval: 2 * time.Hour,
+		}, true},
+	} {
+		t.Run(fmt.Sprint(i), func(t *testing.T) {
+			require.Equal(t, tc.out, tc.in.IsDefaults())
+		})
+	}
+}

pkg/storage/stores/shipper/util/queries.go

@@ -52,7 +52,7 @@ func DoParallelQueries(ctx context.Context, tableQuerier TableQuerier, queries [
 }
 
 // IndexDeduper should always be used on table level not the whole query level because it just looks at range values which can be repeated across tables
-//Cortex anyways dedupes entries across tables
+// Cortex anyways dedupes entries across tables
 type IndexDeduper struct {
 	callback        chunk_util.Callback
 	seenRangeValues map[string]map[string]struct{}