From 26dbd25f951c2864e5067a1df654a9ef51e0b684 Mon Sep 17 00:00:00 2001
From: Lanie Hei <lanie.b.hei@gmail.com>
Date: Wed, 22 Jan 2025 14:01:00 -0800
Subject: [PATCH] Add target cluster to error messaging when verify replication
 tasks fails  (#6936)

## What changed?
Added target cluster to explicitly clarify error message for future
debugging.

## Why?
<!-- Tell your future self why have you made these changes -->

## How did you test it?
<!-- How have you verified this change? Tested locally? Added a unit
test? Checked in staging env? -->

## Potential risks
<!-- Assuming the worst case, what can be broken when deploying this
change to production? -->

## Documentation
<!-- Have you made sure this change doesn't falsify anything currently
stated in `docs/`? If significant
new behavior is added, have you described that in `docs/`? -->

## Is hotfix candidate?
<!-- Is this PR a hotfix candidate or does it require a notification to
be sent to the broader community? (Yes/No) -->
---
 service/worker/migration/activities.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/service/worker/migration/activities.go b/service/worker/migration/activities.go
index af1688fd177..c2c6db10c19 100644
--- a/service/worker/migration/activities.go
+++ b/service/worker/migration/activities.go
@@ -778,10 +778,11 @@ func (a *activities) VerifyReplicationTasks(ctx context.Context, request *verify
 		if diff > defaultNoProgressNotRetryableTimeout {
 			// Potentially encountered a missing execution, return non-retryable error
 			return response, temporal.NewNonRetryableApplicationError(
-				fmt.Sprintf("verifyReplicationTasks was not able to make progress for more than %v minutes (not retryable). Not found WorkflowExecution: %v, Checkpoint: %v",
+				fmt.Sprintf("verifyReplicationTasks was not able to make progress for more than %v minutes (not retryable): could not find WorkflowExecution: '%v' in TargetCluster: '%s': Checkpoint: '%v', ",
 					diff.Minutes(),
-					details.LastNotVerifiedWorkflowExecution, details.CheckPoint),
-				"", nil)
+					details.LastNotVerifiedWorkflowExecution, request.TargetClusterName, details.CheckPoint),
+				"",
+				nil)
 		}
 	}
 }