[membership] Replace Ringop with PeerProvider interface (uber#4653)

Digital-Octopus-Dev · Nov 24, 2021 · 770e9ec · 770e9ec
1 parent 429db90
commit 770e9ec
Show file tree

Hide file tree

Showing 19 changed files with 913 additions and 542 deletions.
diff --git a/client/history/peerResolver_test.go b/client/history/peerResolver_test.go
@@ -35,9 +35,9 @@ func TestPeerResolver(t *testing.T) {
 	numShards := 123
 	controller := gomock.NewController(t)
 	serviceResolver := membership.NewMockResolver(controller)
-	serviceResolver.EXPECT().Lookup(service.History, string(rune(common.DomainIDToHistoryShard("domainID", numShards)))).Return(membership.NewHostInfo("domainHost:thriftPort", nil), nil)
-	serviceResolver.EXPECT().Lookup(service.History, string(rune(common.WorkflowIDToHistoryShard("workflowID", numShards)))).Return(membership.NewHostInfo("workflowHost:thriftPort", nil), nil)
-	serviceResolver.EXPECT().Lookup(service.History, string(rune(99))).Return(membership.NewHostInfo("shardHost:thriftPort", nil), nil)
+	serviceResolver.EXPECT().Lookup(service.History, string(rune(common.DomainIDToHistoryShard("domainID", numShards)))).Return(membership.NewHostInfo("domainHost:thriftPort"), nil)
+	serviceResolver.EXPECT().Lookup(service.History, string(rune(common.WorkflowIDToHistoryShard("workflowID", numShards)))).Return(membership.NewHostInfo("workflowHost:thriftPort"), nil)
+	serviceResolver.EXPECT().Lookup(service.History, string(rune(99))).Return(membership.NewHostInfo("shardHost:thriftPort"), nil)
 	serviceResolver.EXPECT().Lookup(service.History, string(rune(11))).Return(nil, assert.AnError)
 
 	r := NewPeerResolver(numShards, serviceResolver, fakeAddressMapper)

diff --git a/client/matching/peerResolver_test.go b/client/matching/peerResolver_test.go
@@ -33,11 +33,11 @@ import (
 func TestPeerResolver(t *testing.T) {
 	controller := gomock.NewController(t)
 	serviceResolver := membership.NewMockResolver(controller)
-	serviceResolver.EXPECT().Lookup(service.Matching, "taskListA").Return(membership.NewHostInfo("taskListA:thriftPort", nil), nil)
+	serviceResolver.EXPECT().Lookup(service.Matching, "taskListA").Return(membership.NewHostInfo("taskListA:thriftPort"), nil)
 	serviceResolver.EXPECT().Lookup(service.Matching, "invalid").Return(nil, assert.AnError)
 	serviceResolver.EXPECT().Members(service.Matching).Return([]*membership.HostInfo{
-		membership.NewHostInfo("taskListA:thriftPort", nil),
-		membership.NewHostInfo("taskListB:thriftPort", nil),
+		membership.NewHostInfo("taskListA:thriftPort"),
+		membership.NewHostInfo("taskListB:thriftPort"),
 	}, nil)
 
 	r := NewPeerResolver(serviceResolver, fakeAddressMapper)

diff --git a/cmd/server/cadence/server.go b/cmd/server/cadence/server.go
@@ -40,6 +40,7 @@ import (
 	"github.com/uber/cadence/common/membership"
 	"github.com/uber/cadence/common/messaging/kafka"
 	"github.com/uber/cadence/common/metrics"
+	"github.com/uber/cadence/common/peerprovider/ringpopprovider"
 	"github.com/uber/cadence/common/resource"
 	"github.com/uber/cadence/common/rpc"
 	"github.com/uber/cadence/common/service"
@@ -156,10 +157,20 @@ func (s *server) startService() common.Daemon {
 	)
 	rpcFactory := rpc.NewFactory(params.Logger, rpcParams)
 	params.RPCFactory = rpcFactory
-	params.MembershipResolver, err = membership.NewResolver(
+
+	peerProvider, err := ringpopprovider.New(
+		params.Name,
 		&s.cfg.Ringpop,
 		rpcFactory.GetChannel(),
-		params.Name,
+		params.Logger,
+	)
+
+	if err != nil {
+		log.Fatalf("ringpop provider failed: %v", err)
+	}
+
+	params.MembershipResolver, err = membership.NewResolver(
+		peerProvider,
 		params.Logger,
 	)
 	if err != nil {

diff --git a/common/config/config.go b/common/config/config.go
@@ -32,15 +32,15 @@ import (
 
 	"github.com/uber/cadence/common/dynamicconfig"
 	c "github.com/uber/cadence/common/dynamicconfig/configstore/config"
-	"github.com/uber/cadence/common/membership"
+	"github.com/uber/cadence/common/peerprovider/ringpopprovider"
 	"github.com/uber/cadence/common/service"
 )
 
 type (
 	// Config contains the configuration for a set of cadence services
 	Config struct {
 		// Ringpop is the ringpop related configuration
-		Ringpop membership.RingpopConfig `yaml:"ringpop"`
+		Ringpop ringpopprovider.Config `yaml:"ringpop"`
 		// Persistence contains the configuration for cadence datastores
 		Persistence Persistence `yaml:"persistence"`
 		// Log is the logging config