Added LocalStore and realistic data for querier counter reset bug. (#…

…2522) (#2538) * Added LocalStore and realistic data for querier counter reset bug. Tries to reproduces: #2401 I would still merge as it is a great test, and allows us to quickly check data provided by Ben. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Fixed tsdbstore required component type. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Fixed ineffectual set. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Fixed liche. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Fixed unknown store issue. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
thanos-io · Apr 29, 2020 · 416024c · 416024c
1 parent 5d7bb2b
commit 416024c
Show file tree

Hide file tree

Showing 10 changed files with 2,069 additions and 124 deletions.
diff --git a/pkg/component/component.go b/pkg/component/component.go
@@ -81,19 +81,23 @@ func FromProto(storeType storepb.StoreType) StoreAPI {
 		return Store
 	case storepb.StoreType_RECEIVE:
 		return Receive
+	case storepb.StoreType_DEBUG:
+		return Debug
 	default:
-		return nil
+		return UnknownStoreAPI
 	}
 }
 
 var (
-	Bucket     = source{component: component{name: "bucket"}}
-	Compact    = source{component: component{name: "compact"}}
-	Downsample = source{component: component{name: "downsample"}}
-	Query      = sourceStoreAPI{component: component{name: "query"}}
-	Rule       = sourceStoreAPI{component: component{name: "rule"}}
-	Sidecar    = sourceStoreAPI{component: component{name: "sidecar"}}
-	Store      = sourceStoreAPI{component: component{name: "store"}}
-	Receive    = sourceStoreAPI{component: component{name: "receive"}}
-	Replicate  = sourceStoreAPI{component: component{name: "replicate"}}
+	Bucket          = source{component: component{name: "bucket"}}
+	Compact         = source{component: component{name: "compact"}}
+	Downsample      = source{component: component{name: "downsample"}}
+	Replicate       = source{component: component{name: "replicate"}}
+	Debug           = sourceStoreAPI{component: component{name: "debug"}}
+	Receive         = sourceStoreAPI{component: component{name: "receive"}}
+	Rule            = sourceStoreAPI{component: component{name: "rule"}}
+	Sidecar         = sourceStoreAPI{component: component{name: "sidecar"}}
+	Store           = storeAPI{component: component{name: "store"}}
+	UnknownStoreAPI = storeAPI{component: component{name: "unknown-store-api"}}
+	Query           = storeAPI{component: component{name: "query"}}
 )
diff --git a/pkg/query/querier_test.go b/pkg/query/querier_test.go
diff --git a/pkg/query/storeset_test.go b/pkg/query/storeset_test.go
@@ -461,7 +461,7 @@ func TestStoreSet_Update(t *testing.T) {
 
 	// Check stats.
 	expected = newStoreAPIStats()
-	expected[component.StoreAPI(nil)] = map[string]int{
+	expected[component.UnknownStoreAPI] = map[string]int{
 		"{l1=\"no-store-type\", l2=\"v3\"}": 1,
 	}
 	expected[component.Query] = map[string]int{

diff --git a/pkg/query/testdata/issue2401-seriesresponses.json b/pkg/query/testdata/issue2401-seriesresponses.json
diff --git a/pkg/server/grpc/grpc.go b/pkg/server/grpc/grpc.go
@@ -42,7 +42,9 @@ type Server struct {
 
 // New creates a new Server.
 func New(logger log.Logger, reg prometheus.Registerer, tracer opentracing.Tracer, comp component.Component, probe *prober.GRPCProbe, storeSrv storepb.StoreServer, opts ...Option) *Server {
-	options := options{}
+	options := options{
+		network: "tcp",
+	}
 	for _, o := range opts {
 		o.apply(&options)
 	}
@@ -97,7 +99,7 @@ func New(logger log.Logger, reg prometheus.Registerer, tracer opentracing.Tracer
 
 // ListenAndServe listens on the TCP network address and handles requests on incoming connections.
 func (s *Server) ListenAndServe() error {
-	l, err := net.Listen("tcp", s.opts.listen)
+	l, err := net.Listen(s.opts.network, s.opts.listen)
 	if err != nil {
 		return errors.Wrapf(err, "listen gRPC on address %s", s.opts.listen)
 	}

diff --git a/pkg/server/grpc/option.go b/pkg/server/grpc/option.go
@@ -8,9 +8,12 @@ import (
 	"time"
 )
 
+const UnixSocket = "/tmp/test.sock"
+
 type options struct {
 	gracePeriod time.Duration
 	listen      string
+	network     string
 
 	tlsConfig *tls.Config
 }
@@ -42,6 +45,13 @@ func WithListen(s string) Option {
 	})
 }
 
+// WithNetwork sets network to listen for gRPC server e.g tcp, udp or unix.
+func WithNetwork(s string) Option {
+	return optionFunc(func(o *options) {
+		o.network = s
+	})
+}
+
 // WithTLSConfig sets TLS configuration for gRPC server.
 func WithTLSConfig(cfg *tls.Config) Option {
 	return optionFunc(func(o *options) {