Only replicate user data for multi cluster setups (#4484)

temporalio · Jun 13, 2023 · 71748a0 · 71748a0
1 parent ea9ad78
commit 71748a0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/common/namespace/namespace.go b/common/namespace/namespace.go
@@ -212,7 +212,9 @@ func (ns *Namespace) FailoverVersion() int64 {
 	return ns.failoverVersion
 }
 
-// IsGlobalNamespace return whether the namespace is a global namespace
+// IsGlobalNamespace returns whether the namespace is a global namespace.
+// Being a global namespace doesn't necessarily mean that there are multiple registered clusters for it, only that it
+// has a failover version. To determine whether operations should be replicated for a namespace, see ReplicationPolicy.
 func (ns *Namespace) IsGlobalNamespace() bool {
 	return ns.isGlobalNamespace
 }

diff --git a/service/matching/matchingEngine.go b/service/matching/matchingEngine.go
@@ -898,7 +898,7 @@ func (e *matchingEngineImpl) UpdateWorkerBuildIdCompatibility(
 				data.GetVersioningData(),
 				req.GetRemoveBuildIds().GetBuildIds(),
 			)
-			if ns.IsGlobalNamespace() {
+			if ns.ReplicationPolicy() == namespace.ReplicationPolicyMultiCluster {
 				operationCreatedTombstones = true
 			} else {
 				// We don't need to keep the tombstones around if we're not replicating them.

diff --git a/service/matching/taskQueueManager.go b/service/matching/taskQueueManager.go
@@ -514,7 +514,7 @@ func (c *taskQueueManagerImpl) UpdateUserData(ctx context.Context, options UserD
 	if err != nil {
 		return err
 	}
-	if !ns.IsGlobalNamespace() {
+	if ns.ReplicationPolicy() != namespace.ReplicationPolicyMultiCluster {
 		return nil
 	}