disable parquet in updater by default

Signed-off-by: yeya24 <[email protected]>

Author: yeya24

pkg/storage/tsdb/bucketindex/updater.go

@@ -34,8 +34,9 @@ var (
 
 // Updater is responsible to generate an update in-memory bucket index.
 type Updater struct {
-	bkt    objstore.InstrumentedBucket
-	logger log.Logger
+	bkt            objstore.InstrumentedBucket
+	logger         log.Logger
+	parquetEnabled bool
 }
 
 func NewUpdater(bkt objstore.Bucket, userID string, cfgProvider bucket.TenantConfigProvider, logger log.Logger) *Updater {
@@ -45,6 +46,11 @@ func NewUpdater(bkt objstore.Bucket, userID string, cfgProvider bucket.TenantCon
 	}
 }
 
+func (w *Updater) EnableParquet() *Updater {
+	w.parquetEnabled = true
+	return w
+}
+
 // UpdateIndex generates the bucket index and returns it, without storing it to the storage.
 // If the old index is not passed in input, then the bucket index will be generated from scratch.
 func (w *Updater) UpdateIndex(ctx context.Context, old *Index) (*Index, map[ulid.ULID]error, int64, error) {
@@ -104,7 +110,7 @@ func (w *Updater) updateBlocks(ctx context.Context, old []*Block, deletedBlocks
 			// Check if parquet mark has been uploaded for the old block.
 			// TODO: this should be optimized to have all parquet marker in a global path.
 			// We assume parquet marker cannot be removed from a block if it exists before.
-			if b.Parquet == nil {
+			if w.parquetEnabled && b.Parquet == nil {
 				if err := w.updateParquetBlockIndexEntry(ctx, b.ID, b); err != nil {
 					return nil, nil, err
 				}
@@ -119,7 +125,9 @@ func (w *Updater) updateBlocks(ctx context.Context, old []*Block, deletedBlocks
 	for id := range discovered {
 		b, err := w.updateBlockIndexEntry(ctx, id)
 		if err == nil {
-			err = w.updateParquetBlockIndexEntry(ctx, id, b)
+			if w.parquetEnabled {
+				err = w.updateParquetBlockIndexEntry(ctx, id, b)
+			}
 			if err == nil {
 				blocks = append(blocks, b)
 				continue

pkg/storage/tsdb/bucketindex/updater_test.go

@@ -319,7 +319,7 @@ func TestUpdater_UpdateIndex_WithParquet(t *testing.T) {
 	// Add parquet marker to block 1.
 	block1ParquetMark := testutil.MockStorageParquetMark(t, bkt, userID, block1)
 
-	w := NewUpdater(bkt, userID, nil, logger)
+	w := NewUpdater(bkt, userID, nil, logger).EnableParquet()
 	returnedIdx, _, _, err := w.UpdateIndex(ctx, nil)
 	require.NoError(t, err)
 	assertBucketIndexEqualWithParquet(t, returnedIdx, bkt, userID,

pkg/storage/tsdb/testutil/block_mock.go

@@ -5,7 +5,6 @@ import (
 	"crypto/rand"
 	"encoding/json"
 	"fmt"
-	cortex_tsdb "github.com/cortexproject/cortex/pkg/storage/tsdb"
 	"strings"
 	"testing"
 	"time"
@@ -15,6 +14,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/thanos-io/objstore"
 	"github.com/thanos-io/thanos/pkg/block/metadata"
+
+	cortex_tsdb "github.com/cortexproject/cortex/pkg/storage/tsdb"
 )
 
 func MockStorageBlock(t testing.TB, bucket objstore.Bucket, userID string, minT, maxT int64) tsdb.BlockMeta {