Merge index-gateway into store-gateway

harry671003 · Oct 27, 2023 · e78cbbe · e78cbbe
1 parent bb01419
commit e78cbbe
Show file tree

Hide file tree

Showing 13 changed files with 235 additions and 358 deletions.
diff --git a/pkg/api/api.go b/pkg/api/api.go
@@ -362,7 +362,7 @@ func (a *API) RegisterRing(r *ring.Ring) {
 
 // RegisterStoreGateway registers the ring UI page associated with the store-gateway.
 func (a *API) RegisterStoreGateway(s *storegateway.StoreGateway) {
-	storegatewaypb.RegisterIndexGatewayServer(a.server.GRPC, s)
+	storegatewaypb.RegisterStoreGatewayServer(a.server.GRPC, s)
 
 	a.indexPage.AddLink(SectionAdminEndpoints, "/store-gateway/ring", "Store Gateway Ring")
 	a.RegisterRoute("/store-gateway/ring", http.HandlerFunc(s.RingHandler), false, "GET", "POST")

diff --git a/pkg/cortex/modules.go b/pkg/cortex/modules.go
@@ -81,7 +81,7 @@ const (
 	Configs                  string = "configs"
 	AlertManager             string = "alertmanager"
 	Compactor                string = "compactor"
-	IndexGateway             string = "index-gateway"
+	StoreGateway             string = "store-gateway"
 	ChunksGateway            string = "chunks-gateway"
 	MemberlistKV             string = "memberlist-kv"
 	TenantDeletion           string = "tenant-deletion"
@@ -774,7 +774,7 @@ func (t *Cortex) setupModuleManager() error {
 	mm.RegisterModule(Configs, t.initConfig)
 	mm.RegisterModule(AlertManager, t.initAlertManager)
 	mm.RegisterModule(Compactor, t.initCompactor)
-	mm.RegisterModule(IndexGateway, t.initStoreGateway)
+	mm.RegisterModule(StoreGateway, t.initStoreGateway)
 	mm.RegisterModule(ChunksGateway, t.initChunksGateway)
 	mm.RegisterModule(TenantDeletion, t.initTenantDeletionAPI, modules.UserInvisibleModule)
 	mm.RegisterModule(Purger, nil)
@@ -806,12 +806,12 @@ func (t *Cortex) setupModuleManager() error {
 		Configs:                  {API},
 		AlertManager:             {API, MemberlistKV, Overrides},
 		Compactor:                {API, MemberlistKV, Overrides},
-		IndexGateway:             {API, Overrides, MemberlistKV},
+		StoreGateway:             {API, Overrides, MemberlistKV},
 		ChunksGateway:            {API, Overrides, MemberlistKV},
 		TenantDeletion:           {API, Overrides, DeleteRequestsStore},
 		Purger:                   {TenantDeletion},
 		TenantFederation:         {Queryable},
-		All:                      {QueryFrontend, Querier, Ingester, Distributor, Purger, ChunksGateway, IndexGateway, Ruler},
+		All:                      {QueryFrontend, Querier, Ingester, Distributor, Purger, ChunksGateway, StoreGateway, Ruler},
 	}
 	if t.Cfg.ExternalPusher != nil && t.Cfg.ExternalQueryable != nil {
 		deps[Ruler] = []string{Overrides, DeleteRequestsStore, RulerStorage}

diff --git a/pkg/querier/blocks_store_queryable.go b/pkg/querier/blocks_store_queryable.go
@@ -97,7 +97,7 @@ type BlocksFinder interface {
 // BlocksStoreClient is the interface that should be implemented by any client used
 // to query a backend store-gateway.
 type BlocksStoreClient interface {
-	storegatewaypb.IndexGatewayClient
+	storegatewaypb.StoreGatewayClient
 
 	// RemoteAddress returns the address of the remote store-gateway and is used to uniquely
 	// identify a store-gateway backend instance.

diff --git a/pkg/querier/blocks_store_queryable_test.go b/pkg/querier/blocks_store_queryable_test.go
@@ -1728,7 +1728,7 @@ type storeGatewayClientMock struct {
 	mockedLabelValuesErr      error
 }
 
-func (m *storeGatewayClientMock) Series(ctx context.Context, in *storepb.SeriesRequest, opts ...grpc.CallOption) (storegatewaypb.IndexGateway_SeriesClient, error) {
+func (m *storeGatewayClientMock) Series(ctx context.Context, in *storepb.SeriesRequest, opts ...grpc.CallOption) (storegatewaypb.StoreGateway_SeriesClient, error) {
 	seriesClient := &storeGatewaySeriesClientMock{
 		mockedResponses:       m.mockedSeriesResponses,
 		mockedSeriesStreamErr: m.mockedSeriesStreamErr,
@@ -1737,7 +1737,7 @@ func (m *storeGatewayClientMock) Series(ctx context.Context, in *storepb.SeriesR
 	return seriesClient, m.mockedSeriesErr
 }
 
-func (m *storeGatewayClientMock) Select(ctx context.Context, in *storepb.SelectRequest, opts ...grpc.CallOption) (storegatewaypb.IndexGateway_SelectClient, error) {
+func (m *storeGatewayClientMock) Select(ctx context.Context, in *storepb.SelectRequest, opts ...grpc.CallOption) (storegatewaypb.StoreGateway_SelectClient, error) {
 	seriesClient := &storeGatewaySelectClientMock{
 		mockedResponses:       m.mockedSelectResponses,
 		mockedSeriesStreamErr: m.mockedSeriesStreamErr,

diff --git a/pkg/querier/store_gateway_client.go b/pkg/querier/store_gateway_client.go
@@ -57,7 +57,7 @@ func dialStoreGatewayClient(clientCfg grpcclient.Config, addr string, requestDur
 	}
 
 	return &storeGatewayClient{
-		IndexGatewayClient: storegatewaypb.NewIndexGatewayClient(conn),
+		StoreGatewayClient: storegatewaypb.NewStoreGatewayClient(conn),
 		HealthClient:       grpc_health_v1.NewHealthClient(conn),
 		conn:               conn,
 	}, nil
@@ -100,7 +100,7 @@ func (c *chunksGatewayClient) RemoteAddress() string {
 }
 
 type storeGatewayClient struct {
-	storegatewaypb.IndexGatewayClient
+	storegatewaypb.StoreGatewayClient
 	grpc_health_v1.HealthClient
 	conn *grpc.ClientConn
 }

diff --git a/pkg/querier/store_gateway_client_test.go b/pkg/querier/store_gateway_client_test.go
@@ -25,7 +25,7 @@ func Test_newStoreGatewayClientFactory(t *testing.T) {
 	defer grpcServer.GracefulStop()
 
 	srv := &mockStoreGatewayServer{}
-	storegatewaypb.RegisterIndexGatewayServer(grpcServer, srv)
+	storegatewaypb.RegisterStoreGatewayServer(grpcServer, srv)
 
 	listener, err := net.Listen("tcp", "localhost:0")
 	require.NoError(t, err)
@@ -70,11 +70,11 @@ func Test_newStoreGatewayClientFactory(t *testing.T) {
 
 type mockStoreGatewayServer struct{}
 
-func (m *mockStoreGatewayServer) Series(_ *storepb.SeriesRequest, srv storegatewaypb.IndexGateway_SeriesServer) error {
+func (m *mockStoreGatewayServer) Series(_ *storepb.SeriesRequest, srv storegatewaypb.StoreGateway_SeriesServer) error {
 	return nil
 }
 
-func (m *mockStoreGatewayServer) Select(_ *storepb.SelectRequest, srv storegatewaypb.IndexGateway_SelectServer) error {
+func (m *mockStoreGatewayServer) Select(_ *storepb.SelectRequest, srv storegatewaypb.StoreGateway_SelectServer) error {
 	return nil
 }
 

diff --git a/pkg/storegateway/bucket.go b/pkg/storegateway/bucket.go
@@ -1347,7 +1347,7 @@ func (s *BucketStore) Series(req *storepb.SeriesRequest, seriesSrv storepb.Store
 	return srv.Flush()
 }
 
-func (s *BucketStore) Select(req *storepb.SelectRequest, srv storepb.IndexStore_SelectServer) (err error) {
+func (s *BucketStore) Select(req *storepb.SelectRequest, srv storepb.Store_SelectServer) (err error) {
 	if s.queryGate != nil {
 		tracing.DoInSpan(srv.Context(), "store_query_gate_ismyturn", func(ctx context.Context) {
 			err = s.queryGate.Start(srv.Context())

diff --git a/pkg/storegateway/bucket_stores.go b/pkg/storegateway/bucket_stores.go
@@ -340,7 +340,7 @@ func (u *BucketStores) Series(req *storepb.SeriesRequest, srv storepb.Store_Seri
 }
 
 // Series makes a series request to the underlying user bucket store.
-func (u *BucketStores) Select(req *storepb.SelectRequest, srv storepb.IndexStore_SelectServer) error {
+func (u *BucketStores) Select(req *storepb.SelectRequest, srv storepb.Store_SelectServer) error {
 	spanLog, spanCtx := spanlogger.New(srv.Context(), "BucketStores.Series")
 	defer spanLog.Span.Finish()
 

diff --git a/pkg/storegateway/gateway.go b/pkg/storegateway/gateway.go
@@ -358,11 +358,11 @@ func (g *StoreGateway) syncStores(ctx context.Context, reason string) {
 	}
 }
 
-func (g *StoreGateway) Series(req *storepb.SeriesRequest, srv storegatewaypb.IndexGateway_SeriesServer) error {
+func (g *StoreGateway) Series(req *storepb.SeriesRequest, srv storegatewaypb.StoreGateway_SeriesServer) error {
 	return g.stores.Series(req, srv)
 }
 
-func (g *StoreGateway) Select(req *storepb.SelectRequest, srv storegatewaypb.IndexGateway_SelectServer) error {
+func (g *StoreGateway) Select(req *storepb.SelectRequest, srv storegatewaypb.StoreGateway_SelectServer) error {
 	return g.stores.Select(req, srv)
 }