Comments

jakobht · Nov 27, 2024 · e6c31f4 · e6c31f4
1 parent d05953c
commit e6c31f4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/service/sharddistributor/handler/handler.go b/service/sharddistributor/handler/handler.go
@@ -26,6 +26,7 @@ import (
 	"context"
 	"sync"
 
+	"github.com/uber/cadence/client/history"
 	"github.com/uber/cadence/client/matching"
 	"github.com/uber/cadence/common/log"
 	"github.com/uber/cadence/common/metrics"
@@ -36,14 +37,16 @@ func NewHandler(
 	logger log.Logger,
 	metricsClient metrics.Client,
 	matchingPeerResolver matching.PeerResolver,
+	historyPeerResolver history.PeerResolver,
 ) Handler {
 	handler := &handlerImpl{
 		logger:               logger,
 		metricsClient:        metricsClient,
 		matchingPeerResolver: matchingPeerResolver,
+		historyPeerResolver:  historyPeerResolver,
 	}
 
-	// prevent us from trying to serve requests before matching engine is started and ready
+	// prevent us from trying to serve requests before shard distributor is started and ready
 	handler.startWG.Add(1)
 	return handler
 }
@@ -52,6 +55,7 @@ type handlerImpl struct {
 	logger               log.Logger
 	metricsClient        metrics.Client
 	matchingPeerResolver matching.PeerResolver
+	historyPeerResolver  history.PeerResolver
 	startWG              sync.WaitGroup
 }
 

diff --git a/service/sharddistributor/service.go b/service/sharddistributor/service.go
@@ -23,6 +23,7 @@ package sharddistributor
 import (
 	"sync/atomic"
 
+	"github.com/uber/cadence/client/history"
 	"github.com/uber/cadence/client/matching"
 	"github.com/uber/cadence/common"
 	"github.com/uber/cadence/common/dynamicconfig"
@@ -38,10 +39,11 @@ import (
 type Service struct {
 	resource.Resource
 
-	status  int32
-	handler handler.Handler
-	stopC   chan struct{}
-	config  *config.Config
+	status           int32
+	handler          handler.Handler
+	stopC            chan struct{}
+	config           *config.Config
+	numHistoryShards int
 }
 
 // NewService builds a new task manager service
@@ -75,10 +77,11 @@ func NewService(
 	}
 
 	return &Service{
-		Resource: serviceResource,
-		status:   common.DaemonStatusInitialized,
-		config:   serviceConfig,
-		stopC:    make(chan struct{}),
+		Resource:         serviceResource,
+		status:           common.DaemonStatusInitialized,
+		config:           serviceConfig,
+		stopC:            make(chan struct{}),
+		numHistoryShards: params.PersistenceConfig.NumHistoryShards,
 	}, nil
 }
 
@@ -92,8 +95,9 @@ func (s *Service) Start() {
 	logger.Info("shard distributor starting")
 
 	matchingPeerResolver := matching.NewPeerResolver(s.GetMembershipResolver(), membership.PortGRPC)
+	historyPeerResolver := history.NewPeerResolver(s.numHistoryShards, s.GetMembershipResolver(), membership.PortGRPC)
 
-	s.handler = handler.NewHandler(s.GetLogger(), s.GetMetricsClient(), matchingPeerResolver)
+	s.handler = handler.NewHandler(s.GetLogger(), s.GetMetricsClient(), matchingPeerResolver, historyPeerResolver)
 
 	grpcHandler := grpc.NewGRPCHandler(s.handler)
 	grpcHandler.Register(s.GetDispatcher())