Remove Lookup method from Monitor interface (#4072)

* Remove unused methods from Monitor interface

* Remove Lookup method from Monitor interface

common/membership/interfaces.go

@@ -66,7 +66,6 @@ type (
 		// called, other members will discover that this node is no longer part of the
 		// ring. This primitive is useful to carry out graceful host shutdown during deployments.
 		EvictSelf() error
-		Lookup(service primitives.ServiceName, key string) (HostInfo, error)
 		GetResolver(service primitives.ServiceName) (ServiceResolver, error)
 		// GetReachableMembers returns addresses of all members of the ring
 		GetReachableMembers() ([]string, error)

common/membership/ringpop/monitor.go

@@ -374,14 +374,6 @@ func (rpo *monitor) GetResolver(service primitives.ServiceName) (membership.Serv
 	return ring, nil
 }
 
-func (rpo *monitor) Lookup(service primitives.ServiceName, key string) (membership.HostInfo, error) {
-	ring, err := rpo.GetResolver(service)
-	if err != nil {
-		return nil, err
-	}
-	return ring.Lookup(key)
-}
-
 func (rpo *monitor) GetReachableMembers() ([]string, error) {
 	return rpo.rp.GetReachableMembers()
 }

common/membership/ringpop/monitor_test.go

@@ -65,7 +65,7 @@ func (s *RpoSuite) TestMonitor() {
 	err = r.AddListener("test-listener", listenCh)
 	s.Nil(err, "AddListener failed")
 
-	host, err := rpm.Lookup(serviceName, "key")
+	host, err := r.Lookup("key")
 	s.Nil(err, "Ringpop monitor failed to find host for key")
 	s.NotNil(host, "Ringpop monitor returned a nil host")
 
@@ -86,7 +86,7 @@ func (s *RpoSuite) TestMonitor() {
 		s.Fail("Timed out waiting for failure to be detected by ringpop")
 	}
 
-	host, err = rpm.Lookup(serviceName, "key")
+	host, err = r.Lookup("key")
 	s.Nil(err, "Ringpop monitor failed to find host for key")
 	s.NotEqual(testService.hostAddrs[1], host.GetAddress(), "Ringpop monitor assigned key to dead host")
 

service/frontend/adminHandler.go

@@ -638,7 +638,11 @@ func (adh *AdminHandler) DescribeMutableState(ctx context.Context, request *admi
 	shardID := common.WorkflowIDToHistoryShard(namespaceID.String(), request.Execution.WorkflowId, adh.numberOfHistoryShards)
 	shardIDStr := convert.Int32ToString(shardID)
 
-	historyHost, err := adh.membershipMonitor.Lookup(primitives.HistoryService, shardIDStr)
+	resolver, err := adh.membershipMonitor.GetResolver(primitives.HistoryService)
+	if err != nil {
+		return nil, err
+	}
+	historyHost, err := resolver.Lookup(shardIDStr)
 	if err != nil {
 		return nil, err
 	}

tests/simpleMonitor.go

@@ -26,7 +26,6 @@ package tests
 
 import (
 	"context"
-	"fmt"
 
 	"go.temporal.io/server/common/membership"
 	"go.temporal.io/server/common/primitives"
@@ -70,14 +69,6 @@ func (s *simpleMonitor) GetResolver(service primitives.ServiceName) (membership.
 	return resolver, nil
 }
 
-func (s *simpleMonitor) Lookup(service primitives.ServiceName, key string) (membership.HostInfo, error) {
-	resolver, ok := s.resolvers[service]
-	if !ok {
-		return nil, fmt.Errorf("cannot lookup host for service %v", service)
-	}
-	return resolver.Lookup(key)
-}
-
 func (s *simpleMonitor) GetReachableMembers() ([]string, error) {
 	return nil, nil
 }