Backport 11157 to k174. (#11168)

**What this PR does / why we need it**:
Backport #11157 into k174

docs/sources/configure/_index.md

@@ -2241,11 +2241,6 @@ tsdb_shipper:
 
   [ingesterdbretainperiod: <duration>]
 
-  # Experimental. Whether TSDB should cache postings or not. The
-  # index-read-cache will be used as the backend.
-  # CLI flag: -tsdb.enable-postings-cache
-  [enable_postings_cache: <boolean> | default = false]
-
 # Configures Bloom Shipper.
 bloom_shipper:
   # Working directory to store downloaded Bloom Blocks.

integration/loki_micro_services_test.go

@@ -579,142 +579,6 @@ func TestSchedulerRing(t *testing.T) {
 	})
 }
 
-func TestQueryTSDB_WithCachedPostings(t *testing.T) {
-	clu := cluster.New(nil, cluster.SchemaWithTSDB)
-
-	defer func() {
-		assert.NoError(t, clu.Cleanup())
-	}()
-
-	var (
-		tDistributor = clu.AddComponent(
-			"distributor",
-			"-target=distributor",
-		)
-		tIndexGateway = clu.AddComponent(
-			"index-gateway",
-			"-target=index-gateway",
-			"-tsdb.enable-postings-cache=true",
-			"-store.index-cache-read.embedded-cache.enabled=true",
-		)
-	)
-	require.NoError(t, clu.Run())
-
-	var (
-		tIngester = clu.AddComponent(
-			"ingester",
-			"-target=ingester",
-			"-ingester.flush-on-shutdown=true",
-			"-tsdb.shipper.index-gateway-client.server-address="+tIndexGateway.GRPCURL(),
-		)
-		tQueryScheduler = clu.AddComponent(
-			"query-scheduler",
-			"-target=query-scheduler",
-			"-query-scheduler.use-scheduler-ring=false",
-			"-tsdb.shipper.index-gateway-client.server-address="+tIndexGateway.GRPCURL(),
-		)
-		tCompactor = clu.AddComponent(
-			"compactor",
-			"-target=compactor",
-			"-boltdb.shipper.compactor.compaction-interval=1s",
-			"-tsdb.shipper.index-gateway-client.server-address="+tIndexGateway.GRPCURL(),
-		)
-	)
-	require.NoError(t, clu.Run())
-
-	// finally, run the query-frontend and querier.
-	var (
-		tQueryFrontend = clu.AddComponent(
-			"query-frontend",
-			"-target=query-frontend",
-			"-frontend.scheduler-address="+tQueryScheduler.GRPCURL(),
-			"-frontend.default-validity=0s",
-			"-common.compactor-address="+tCompactor.HTTPURL(),
-			"-tsdb.shipper.index-gateway-client.server-address="+tIndexGateway.GRPCURL(),
-		)
-		_ = clu.AddComponent(
-			"querier",
-			"-target=querier",
-			"-querier.scheduler-address="+tQueryScheduler.GRPCURL(),
-			"-common.compactor-address="+tCompactor.HTTPURL(),
-			"-tsdb.shipper.index-gateway-client.server-address="+tIndexGateway.GRPCURL(),
-		)
-	)
-	require.NoError(t, clu.Run())
-
-	tenantID := randStringRunes()
-
-	now := time.Now()
-	cliDistributor := client.New(tenantID, "", tDistributor.HTTPURL())
-	cliDistributor.Now = now
-	cliIngester := client.New(tenantID, "", tIngester.HTTPURL())
-	cliIngester.Now = now
-	cliQueryFrontend := client.New(tenantID, "", tQueryFrontend.HTTPURL())
-	cliQueryFrontend.Now = now
-	cliIndexGateway := client.New(tenantID, "", tIndexGateway.HTTPURL())
-	cliIndexGateway.Now = now
-
-	// initial cache state.
-	igwMetrics, err := cliIndexGateway.Metrics()
-	require.NoError(t, err)
-	assertCacheState(t, igwMetrics, &expectedCacheState{
-		cacheName: "store.index-cache-read.embedded-cache",
-		misses:    0,
-		added:     0,
-	})
-
-	t.Run("ingest-logs", func(t *testing.T) {
-		require.NoError(t, cliDistributor.PushLogLine("lineA", time.Now().Add(-72*time.Hour), nil, map[string]string{"job": "fake"}))
-		require.NoError(t, cliDistributor.PushLogLine("lineB", time.Now().Add(-48*time.Hour), nil, map[string]string{"job": "fake"}))
-	})
-
-	// restart ingester which should flush the chunks and index
-	require.NoError(t, tIngester.Restart())
-
-	// Query lines
-	t.Run("query to verify logs being served from storage", func(t *testing.T) {
-		resp, err := cliQueryFrontend.RunRangeQuery(context.Background(), `{job="fake"}`)
-		require.NoError(t, err)
-		assert.Equal(t, "streams", resp.Data.ResultType)
-
-		var lines []string
-		for _, stream := range resp.Data.Stream {
-			for _, val := range stream.Values {
-				lines = append(lines, val[1])
-			}
-		}
-
-		assert.ElementsMatch(t, []string{"lineA", "lineB"}, lines)
-	})
-
-	igwMetrics, err = cliIndexGateway.Metrics()
-	require.NoError(t, err)
-	assertCacheState(t, igwMetrics, &expectedCacheState{
-		cacheName: "store.index-cache-read.embedded-cache",
-		misses:    1,
-		added:     1,
-	})
-
-	// ingest logs with ts=now.
-	require.NoError(t, cliDistributor.PushLogLine("lineC", now, nil, map[string]string{"job": "fake"}))
-	require.NoError(t, cliDistributor.PushLogLine("lineD", now, nil, map[string]string{"job": "fake"}))
-
-	// default length is 7 days.
-	resp, err := cliQueryFrontend.RunRangeQuery(context.Background(), `{job="fake"}`)
-	require.NoError(t, err)
-	assert.Equal(t, "streams", resp.Data.ResultType)
-
-	var lines []string
-	for _, stream := range resp.Data.Stream {
-		for _, val := range stream.Values {
-			lines = append(lines, val[1])
-		}
-	}
-	// expect lines from both, ingesters memory and from the store.
-	assert.ElementsMatch(t, []string{"lineA", "lineB", "lineC", "lineD"}, lines)
-
-}
-
 func TestOTLPLogsIngestQuery(t *testing.T) {
 	clu := cluster.New(nil, func(c *cluster.Cluster) {
 		c.SetSchemaVer("v13")
@@ -859,7 +723,6 @@ func TestCategorizedLabels(t *testing.T) {
 		tIndexGateway = clu.AddComponent(
 			"index-gateway",
 			"-target=index-gateway",
-			"-tsdb.enable-postings-cache=true",
 			"-store.index-cache-read.embedded-cache.enabled=true",
 		)
 	)

pkg/storage/factory.go

@@ -38,7 +38,6 @@ import (
 	"github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/downloads"
 	"github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/gatewayclient"
 	"github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/indexgateway"
-	"github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb"
 	"github.com/grafana/loki/pkg/util"
 	util_log "github.com/grafana/loki/pkg/util/log"
 )
@@ -335,7 +334,7 @@ type Config struct {
 
 	MaxChunkBatchSize   int                       `yaml:"max_chunk_batch_size"`
 	BoltDBShipperConfig boltdb.IndexCfg           `yaml:"boltdb_shipper" doc:"description=Configures storing index in an Object Store (GCS/S3/Azure/Swift/COS/Filesystem) in the form of boltdb files. Required fields only required when boltdb-shipper is defined in config."`
-	TSDBShipperConfig   tsdb.IndexCfg             `yaml:"tsdb_shipper" doc:"description=Configures storing index in an Object Store (GCS/S3/Azure/Swift/COS/Filesystem) in a prometheus TSDB-like format. Required fields only required when TSDB is defined in config."`
+	TSDBShipperConfig   indexshipper.Config       `yaml:"tsdb_shipper" doc:"description=Configures storing index in an Object Store (GCS/S3/Azure/Swift/COS/Filesystem) in a prometheus TSDB-like format. Required fields only required when TSDB is defined in config."`
 	BloomShipperConfig  bloomshipperconfig.Config `yaml:"bloom_shipper" doc:"description=Configures Bloom Shipper."`
 
 	// Config for using AsyncStore when using async index stores like `boltdb-shipper`.

pkg/storage/store.go

@@ -259,7 +259,7 @@ func (s *LokiStore) storeForPeriod(p config.PeriodConfig, tableRange config.Tabl
 	indexClientLogger := log.With(s.logger, "index-store", fmt.Sprintf("%s-%s", p.IndexType, p.From.String()))
 
 	if p.IndexType == config.TSDBType {
-		if shouldUseIndexGatewayClient(s.cfg.TSDBShipperConfig.Config) {
+		if shouldUseIndexGatewayClient(s.cfg.TSDBShipperConfig) {
 			// inject the index-gateway client into the index store
 			gw, err := gatewayclient.NewGatewayClient(s.cfg.TSDBShipperConfig.IndexGatewayClientConfig, indexClientReg, s.limits, indexClientLogger)
 			if err != nil {
@@ -284,7 +284,7 @@ func (s *LokiStore) storeForPeriod(p config.PeriodConfig, tableRange config.Tabl
 		}
 
 		name := fmt.Sprintf("%s_%s", p.ObjectType, p.From.String())
-		indexReaderWriter, stopTSDBStoreFunc, err := tsdb.NewStore(name, s.cfg.TSDBShipperConfig, s.schemaCfg, f, objectClient, s.limits, tableRange, indexClientReg, indexClientLogger, s.indexReadCache)
+		indexReaderWriter, stopTSDBStoreFunc, err := tsdb.NewStore(name, s.cfg.TSDBShipperConfig, s.schemaCfg, f, objectClient, s.limits, tableRange, indexClientReg, indexClientLogger)
 		if err != nil {
 			return nil, nil, nil, err
 		}

pkg/storage/store_test.go

@@ -31,7 +31,6 @@ import (
 	"github.com/grafana/loki/pkg/storage/config"
 	"github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper"
 	"github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/boltdb"
-	"github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb"
 	util_log "github.com/grafana/loki/pkg/util/log"
 	"github.com/grafana/loki/pkg/util/marshal"
 	"github.com/grafana/loki/pkg/validation"
@@ -1014,7 +1013,7 @@ func TestStore_indexPrefixChange(t *testing.T) {
 
 	cfg := Config{
 		FSConfig:          local.FSConfig{Directory: path.Join(tempDir, "chunks")},
-		TSDBShipperConfig: tsdb.IndexCfg{Config: shipperConfig},
+		TSDBShipperConfig: shipperConfig,
 		NamedStores: NamedStores{
 			Filesystem: map[string]NamedFSConfig{
 				"named-store": {Directory: path.Join(tempDir, "named-store")},
@@ -1191,7 +1190,7 @@ func TestStore_MultiPeriod(t *testing.T) {
 			cfg := Config{
 				FSConfig:            local.FSConfig{Directory: path.Join(tempDir, "chunks")},
 				BoltDBShipperConfig: boltdb.IndexCfg{Config: shipperConfig},
-				TSDBShipperConfig:   tsdb.IndexCfg{Config: shipperConfig, CachePostings: false},
+				TSDBShipperConfig:   shipperConfig,
 				NamedStores: NamedStores{
 					Filesystem: map[string]NamedFSConfig{
 						"named-store": {Directory: path.Join(tempDir, "named-store")},
@@ -1514,7 +1513,7 @@ func TestStore_BoltdbTsdbSameIndexPrefix(t *testing.T) {
 	boltdbShipperConfig.IngesterName = ingesterName
 
 	// config for tsdb Shipper
-	tsdbShipperConfig := tsdb.IndexCfg{}
+	tsdbShipperConfig := indexshipper.Config{}
 	flagext.DefaultValues(&tsdbShipperConfig)
 	tsdbShipperConfig.ActiveIndexDirectory = path.Join(tempDir, "tsdb-index")
 	tsdbShipperConfig.SharedStoreType = config.StorageTypeFileSystem