Remove common.Daemon from Monitor interface (#4084)

temporalio · Mar 28, 2023 · afc5ac7 · afc5ac7
1 parent 4431446
commit afc5ac7
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 46 deletions.
diff --git a/common/membership/interfaces.go b/common/membership/interfaces.go
@@ -32,7 +32,6 @@ import (
 
 	"go.temporal.io/api/serviceerror"
 
-	"go.temporal.io/server/common"
 	"go.temporal.io/server/common/primitives"
 )
 
@@ -59,8 +58,6 @@ type (
 	// Monitor provides membership information for all temporal services.
 	// It can be used to query which member host of a service is responsible for serving a given key.
 	Monitor interface {
-		common.Daemon
-
 		WhoAmI() (HostInfo, error)
 		// EvictSelf evicts this member from the membership ring. After this method is
 		// called, other members will discover that this node is no longer part of the

diff --git a/common/membership/interfaces_mock.go b/common/membership/interfaces_mock.go
diff --git a/common/membership/ringpop/factory.go b/common/membership/ringpop/factory.go
@@ -61,11 +61,11 @@ type factory struct {
 	servicePortMap map[primitives.ServiceName]int
 	logger         log.Logger
 
-	membershipMonitor membership.Monitor
-	metadataManager   persistence.ClusterMetadataManager
-	rpcConfig         *config.RPC
-	tlsFactory        encryption.TLSConfigProvider
-	dc                *dynamicconfig.Collection
+	monitor         *monitor
+	metadataManager persistence.ClusterMetadataManager
+	rpcConfig       *config.RPC
+	tlsFactory      encryption.TLSConfigProvider
+	dc              *dynamicconfig.Collection
 
 	chOnce  sync.Once
 	monOnce sync.Once
@@ -103,12 +103,8 @@ func newFactory(
 	}, nil
 }
 
-// getMembershipMonitor return a membership monitor
-func (factory *factory) getMembershipMonitor() (membership.Monitor, error) {
-	return factory.getMembership()
-}
-
-func (factory *factory) getMembership() (membership.Monitor, error) {
+// getMonitor return a membership monitor
+func (factory *factory) getMonitor() (*monitor, error) {
 	var err error
 	factory.monOnce.Do(func() {
 		ctx, cancel := context.WithTimeout(context.Background(), persistenceOperationTimeout)
@@ -128,7 +124,7 @@ func (factory *factory) getMembership() (membership.Monitor, error) {
 		} else {
 			mrp := newService(rp, factory.config.MaxJoinDuration, factory.logger)
 
-			factory.membershipMonitor = newMonitor(
+			factory.monitor = newMonitor(
 				factory.serviceName,
 				factory.servicePortMap,
 				mrp,
@@ -139,7 +135,7 @@ func (factory *factory) getMembership() (membership.Monitor, error) {
 		}
 	})
 
-	return factory.membershipMonitor, err
+	return factory.monitor, err
 }
 
 func (factory *factory) broadcastAddressResolver() (string, error) {

diff --git a/common/membership/ringpop/fx.go b/common/membership/ringpop/fx.go
@@ -72,7 +72,7 @@ func membershipMonitorProvider(
 		return nil, err
 	}
 
-	monitor, err := factory.getMembershipMonitor()
+	monitor, err := factory.getMonitor()
 	if err != nil {
 		return nil, err
 	}

diff --git a/common/membership/ringpop/monitor.go b/common/membership/ringpop/monitor.go
@@ -84,7 +84,7 @@ func newMonitor(
 	logger log.Logger,
 	metadataManager persistence.ClusterMetadataManager,
 	broadcastHostPortResolver func() (string, error),
-) membership.Monitor {
+) *monitor {
 	lifecycleCtx, lifecycleCancel := context.WithCancel(context.Background())
 	lifecycleCtx = headers.SetCallerInfo(
 		lifecycleCtx,

diff --git a/common/membership/ringpop/test_cluster.go b/common/membership/ringpop/test_cluster.go
@@ -46,7 +46,7 @@ type testCluster struct {
 	hostUUIDs    []string
 	hostAddrs    []string
 	hostInfoList []membership.HostInfo
-	rings        []membership.Monitor
+	rings        []*monitor
 	channels     []*tchannel.Channel
 	seedNode     string
 }
@@ -75,7 +75,7 @@ func newTestCluster(
 		hostUUIDs:    make([]string, size),
 		hostAddrs:    make([]string, size),
 		hostInfoList: make([]membership.HostInfo, size),
-		rings:        make([]membership.Monitor, size),
+		rings:        make([]*monitor, size),
 		channels:     make([]*tchannel.Channel, size),
 		seedNode:     seed,
 	}

diff --git a/service/worker/service.go b/service/worker/service.go
@@ -368,7 +368,6 @@ func (s *Service) Start() {
 	s.metricsHandler.Counter(metrics.RestartCount).Record(1)
 
 	s.clusterMetadata.Start()
-	s.membershipMonitor.Start()
 	s.namespaceRegistry.Start()
 
 	hostInfo, err := s.membershipMonitor.WhoAmI()
@@ -431,7 +430,6 @@ func (s *Service) Stop() {
 	s.perNamespaceWorkerManager.Stop()
 	s.workerManager.Stop()
 	s.namespaceRegistry.Stop()
-	s.membershipMonitor.Stop()
 	s.clusterMetadata.Stop()
 	s.persistenceBean.Close()
 	s.visibilityManager.Close()