make register domain aware of active cluster name (cadence-workflow#576)

haoxuu · Feb 23, 2018 · ad78f5f · ad78f5f
1 parent 2740e6b
commit ad78f5f
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 6 deletions.
diff --git a/.gen/go/shared/idl.go b/.gen/go/shared/idl.go
diff --git a/.gen/go/shared/types.go b/.gen/go/shared/types.go
diff --git a/host/integration_test.go b/host/integration_test.go
@@ -200,11 +200,15 @@ func (s *integrationSuite) TestIntegrationRegisterGetDomain_NoDefault() {
 	email := "some random email"
 	retention := int32(7)
 	emitMetric := true
+	activeClusterName := ""
 	clusters := []*workflow.ClusterReplicationConfiguration{}
 	for clusterName := range s.ClusterMetadata.GetAllClusterNames() {
 		clusters = append(clusters, &workflow.ClusterReplicationConfiguration{
 			ClusterName: common.StringPtr(clusterName),
 		})
+		if clusterName != s.ClusterMetadata.GetCurrentClusterName() {
+			activeClusterName = clusterName
+		}
 	}
 
 	err := s.engine.RegisterDomain(createContext(), &workflow.RegisterDomainRequest{
@@ -214,6 +218,7 @@ func (s *integrationSuite) TestIntegrationRegisterGetDomain_NoDefault() {
 		WorkflowExecutionRetentionPeriodInDays: common.Int32Ptr(retention),
 		EmitMetric:                             common.BoolPtr(emitMetric),
 		Clusters:                               clusters,
+		ActiveClusterName:                      common.StringPtr(activeClusterName),
 	})
 	s.Nil(err)
 
@@ -227,7 +232,7 @@ func (s *integrationSuite) TestIntegrationRegisterGetDomain_NoDefault() {
 	s.Equal(email, resp.DomainInfo.GetOwnerEmail())
 	s.Equal(retention, resp.Configuration.GetWorkflowExecutionRetentionPeriodInDays())
 	s.Equal(emitMetric, resp.Configuration.GetEmitMetric())
-	s.Equal(s.ClusterMetadata.GetCurrentClusterName(), resp.ReplicationConfiguration.GetActiveClusterName())
+	s.Equal(activeClusterName, resp.ReplicationConfiguration.GetActiveClusterName())
 	s.Equal(clusters, resp.ReplicationConfiguration.Clusters)
 }
 

diff --git a/idl/github.com/uber/cadence/shared.thrift b/idl/github.com/uber/cadence/shared.thrift
@@ -755,6 +755,7 @@ struct RegisterDomainRequest {
   40: optional i32 workflowExecutionRetentionPeriodInDays
   50: optional bool emitMetric
   60: optional list<ClusterReplicationConfiguration> clusters
+  70: optional string activeClusterName
 }
 
 struct DescribeDomainRequest {

diff --git a/service/frontend/handler.go b/service/frontend/handler.go
@@ -166,6 +166,12 @@ func (wh *WorkflowHandler) RegisterDomain(ctx context.Context, registerRequest *
 	// input validation on cluster names
 	clusterMetadata := wh.GetClusterMetadata()
 	activeClusterName := clusterMetadata.GetCurrentClusterName()
+	if registerRequest.ActiveClusterName != nil {
+		activeClusterName = registerRequest.GetActiveClusterName()
+		if err := wh.validateClusterName(activeClusterName); err != nil {
+			return wh.error(err, scope)
+		}
+	}
 	clusters := []*persistence.ClusterReplicationConfig{}
 	for _, cluster := range registerRequest.Clusters {
 		clusterName := cluster.GetClusterName()