Fix TSDB store

Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>

pkg/receive/multitsdb.go

@@ -31,8 +31,6 @@ import (
 
 	"github.com/thanos-io/objstore"
 
-	"github.com/thanos-io/thanos/pkg/stringset"
-
 	"github.com/thanos-io/thanos/pkg/block/metadata"
 	"github.com/thanos-io/thanos/pkg/component"
 	"github.com/thanos-io/thanos/pkg/errutil"
@@ -109,15 +107,6 @@ func newLocalClient(c storepb.StoreClient, store *store.TSDBStore) *localClient
 	}
 }
 
-func (l *localClient) LabelNamesSet() stringset.Set {
-	labelNames, err := l.store.LabelNames(context.Background(), &storepb.LabelNamesRequest{})
-	if err != nil {
-		return stringset.AllStrings()
-	}
-
-	return stringset.NewFromStrings(labelNames.Names...)
-}
-
 func (l *localClient) LabelSets() []labels.Labels {
 	return labelpb.ZLabelSetsToPromLabelSets(l.store.LabelSet()...)
 }

pkg/store/tsdb.go

@@ -5,6 +5,7 @@ package store
 
 import (
 	"context"
+	"fmt"
 	"hash"
 	"io"
 	"math"
@@ -210,14 +211,15 @@ func (s *TSDBStore) Series(r *storepb.SeriesRequest, srv storepb.Store_SeriesSer
 	for _, lbl := range r.WithoutReplicaLabels {
 		extLsetToRemove[lbl] = struct{}{}
 	}
+	finalExtLset := rmLabels(s.extLset.Copy(), extLsetToRemove)
 
-	if s.labelNamesSet.HasAny(r.WithoutReplicaLabels) {
+	fmt.Println(r.WithoutReplicaLabels)
+	if s.LabelNamesSet().HasAny(r.WithoutReplicaLabels) {
+		fmt.Println("resorting")
 		rs := &resortingServer{Store_SeriesServer: srv}
 		defer rs.Flush()
 		srv = rs
 	}
-
-	finalExtLset := rmLabels(s.extLset.Copy(), extLsetToRemove)
 	// Stream at most one series per frame; series may be split over multiple frames according to maxBytesInFrame.
 	for set.Next() {
 		series := set.At()
@@ -383,18 +385,27 @@ func (s *TSDBStore) LabelValues(ctx context.Context, r *storepb.LabelValuesReque
 
 func (s *TSDBStore) UpdateLabelNames(ctx context.Context) {
 	newSet := stringset.New()
-	labelNames, err := s.LabelNames(ctx, &storepb.LabelNamesRequest{})
+	q, err := s.db.ChunkQuerier(ctx, math.MinInt64, math.MaxInt64)
+	if err != nil {
+		level.Warn(s.logger).Log("msg", "error creating tsdb querier", "err", err.Error())
+		s.setLabelNamesSet(stringset.AllStrings())
+		return
+	}
+	defer runutil.CloseWithLogOnErr(s.logger, q, "close tsdb querier label names")
+
+	res, _, err := q.LabelNames()
 	if err != nil {
 		level.Warn(s.logger).Log("msg", "error getting label names", "err", err.Error())
-		s.lmx.Lock()
-		s.labelNamesSet = stringset.AllStrings()
-		s.lmx.Unlock()
+		s.setLabelNamesSet(stringset.AllStrings())
 		return
 	}
-	for _, l := range labelNames.Names {
+	for _, l := range res {
 		newSet.Insert(l)
 	}
+	s.setLabelNamesSet(newSet)
+}
 
+func (s *TSDBStore) setLabelNamesSet(newSet stringset.Set) {
 	s.lmx.Lock()
 	s.labelNamesSet = newSet
 	s.lmx.Unlock()

pkg/stringset/set.go

@@ -72,7 +72,7 @@ func (e mutableSet) HasAny(strings []string) bool {
 
 type allStringsSet struct{}
 
-func (e allStringsSet) HasAny(strings []string) bool {
+func (e allStringsSet) HasAny(_ []string) bool {
 	return true
 }
 

test/e2e/receive_test.go

@@ -20,6 +20,7 @@ import (
 	"github.com/prometheus/prometheus/model/relabel"
 
 	"github.com/efficientgo/core/testutil"
+
 	"github.com/thanos-io/thanos/pkg/promclient"
 	"github.com/thanos-io/thanos/pkg/receive"
 	"github.com/thanos-io/thanos/test/e2e/e2ethanos"