Improve is cross cluster task check (cadence-workflow#4326)

bill822 · Jul 23, 2021 · 23eb8be · 23eb8be
1 parent 989e35c
commit 23eb8be
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/service/history/task/cross_cluster_target_task_executor_test.go b/service/history/task/cross_cluster_target_task_executor_test.go
@@ -27,6 +27,7 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
+
 	"github.com/uber/cadence/client/history"
 	"github.com/uber/cadence/common"
 	"github.com/uber/cadence/common/cluster"

diff --git a/service/history/task/transfer_active_task_executor.go b/service/history/task/transfer_active_task_executor.go
@@ -409,7 +409,7 @@ func (t *transferActiveTaskExecutor) processCancelExecution(
 		return err
 	}
 
-	if targetCluster, isCrossCluster := t.isCrossClusterTask(targetDomainEntry); isCrossCluster {
+	if targetCluster, isCrossCluster := t.isCrossClusterTask(task.DomainID, targetDomainEntry); isCrossCluster {
 		return t.generateCrossClusterTask(ctx, wfContext, task, targetCluster)
 	}
 
@@ -509,7 +509,7 @@ func (t *transferActiveTaskExecutor) processSignalExecution(
 		return err
 	}
 
-	if targetCluster, isCrossCluster := t.isCrossClusterTask(targetDomainEntry); isCrossCluster {
+	if targetCluster, isCrossCluster := t.isCrossClusterTask(task.DomainID, targetDomainEntry); isCrossCluster {
 		return t.generateCrossClusterTask(ctx, wfContext, task, targetCluster)
 	}
 
@@ -630,7 +630,7 @@ func (t *transferActiveTaskExecutor) processStartChildExecution(
 		// it is possible that the domain got deleted. Use domainID instead as this is only needed for the history event
 		targetDomainName = task.TargetDomainID
 	} else {
-		if targetCluster, isCrossCluster := t.isCrossClusterTask(targetDomainEntry); isCrossCluster {
+		if targetCluster, isCrossCluster := t.isCrossClusterTask(task.DomainID, targetDomainEntry); isCrossCluster {
 			return t.generateCrossClusterTask(ctx, wfContext, task, targetCluster)
 		}
 
@@ -1194,8 +1194,13 @@ func (t *transferActiveTaskExecutor) signalExternalExecutionFailed(
 }
 
 func (t *transferActiveTaskExecutor) isCrossClusterTask(
+	sourceDomainID string,
 	targetDomainEntry *cache.DomainCacheEntry,
 ) (string, bool) {
+	if sourceDomainID == targetDomainEntry.GetInfo().ID {
+		return "", false
+	}
+
 	targetCluster := targetDomainEntry.GetReplicationConfig().ActiveClusterName
 	if targetCluster != t.shard.GetClusterMetadata().GetCurrentClusterName() {
 		return targetCluster, true