Generate namespace replication only with 2+ clusters (temporalio#2513)

* Generate namespace replication only with 2+ clusters
jleach4 · Feb 17, 2022 · 1f2b291 · 1f2b291
1 parent 24f6dc3
commit 1f2b291
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 24 deletions.
diff --git a/common/namespace/handler.go b/common/namespace/handler.go
@@ -267,19 +267,17 @@ func (d *HandlerImpl) RegisterNamespace(
 		return nil, err
 	}
 
-	if namespaceRequest.IsGlobalNamespace {
-		err = d.namespaceReplicator.HandleTransmissionTask(
-			enumsspb.NAMESPACE_OPERATION_CREATE,
-			namespaceRequest.Namespace.Info,
-			namespaceRequest.Namespace.Config,
-			namespaceRequest.Namespace.ReplicationConfig,
-			namespaceRequest.Namespace.ConfigVersion,
-			namespaceRequest.Namespace.FailoverVersion,
-			namespaceRequest.IsGlobalNamespace,
-		)
-		if err != nil {
-			return nil, err
-		}
+	err = d.namespaceReplicator.HandleTransmissionTask(
+		enumsspb.NAMESPACE_OPERATION_CREATE,
+		namespaceRequest.Namespace.Info,
+		namespaceRequest.Namespace.Config,
+		namespaceRequest.Namespace.ReplicationConfig,
+		namespaceRequest.Namespace.ConfigVersion,
+		namespaceRequest.Namespace.FailoverVersion,
+		namespaceRequest.IsGlobalNamespace,
+	)
+	if err != nil {
+		return nil, err
 	}
 
 	d.logger.Info("Register namespace succeeded",
@@ -572,12 +570,10 @@ func (d *HandlerImpl) UpdateNamespace(
 		}
 	}
 
-	if isGlobalNamespace {
-		err = d.namespaceReplicator.HandleTransmissionTask(enumsspb.NAMESPACE_OPERATION_UPDATE,
-			info, config, replicationConfig, configVersion, failoverVersion, isGlobalNamespace)
-		if err != nil {
-			return nil, err
-		}
+	err = d.namespaceReplicator.HandleTransmissionTask(enumsspb.NAMESPACE_OPERATION_UPDATE,
+		info, config, replicationConfig, configVersion, failoverVersion, isGlobalNamespace)
+	if err != nil {
+		return nil, err
 	}
 
 	response := &workflowservice.UpdateNamespaceResponse{

diff --git a/common/namespace/handler_GlobalNamespaceEnabled_MasterCluster_test.go b/common/namespace/handler_GlobalNamespaceEnabled_MasterCluster_test.go
@@ -441,7 +441,7 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestRegisterG
 		})
 	}
 
-	s.mockProducer.EXPECT().Publish(gomock.Any()).Return(nil)
+	s.mockProducer.EXPECT().Publish(gomock.Any()).Return(nil).Times(0)
 
 	retention := 1 * time.Hour * 24
 	registerResp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{

diff --git a/common/namespace/handler_test.go b/common/namespace/handler_test.go
@@ -448,7 +448,6 @@ func (s *namespaceHandlerCommonSuite) TestUpdateNamespace_PromoteLocalNamespace(
 		Namespace:        namespace,
 		PromoteNamespace: true,
 	}
-	s.mockProducer.EXPECT().Publish(gomock.Any())
 	_, err = s.handler.UpdateNamespace(context.Background(), updateRequest)
 	s.NoError(err)
 

diff --git a/common/namespace/transmissionTaskHandler.go b/common/namespace/transmissionTaskHandler.go
@@ -47,7 +47,7 @@ type (
 			replicationConfig *persistencespb.NamespaceReplicationConfig,
 			configVersion int64,
 			failoverVersion int64,
-			isGlobalNamespaceEnabled bool,
+			isGlobalNamespace bool,
 		) error
 	}
 
@@ -76,10 +76,13 @@ func (namespaceReplicator *namespaceReplicatorImpl) HandleTransmissionTask(
 	replicationConfig *persistencespb.NamespaceReplicationConfig,
 	configVersion int64,
 	failoverVersion int64,
-	isGlobalNamespaceEnabled bool,
+	isGlobalNamespace bool,
 ) error {
 
-	if !isGlobalNamespaceEnabled {
+	if !isGlobalNamespace {
+		return nil
+	}
+	if len(replicationConfig.Clusters) <= 1 {
 		return nil
 	}