Use stored WorkerControlTaskQueue for activity cancellation dispatch

Instead of looking up the control queue name from the worker registry,
use the WorkerControlTaskQueue that was persisted in ActivityInfo when
the activity started. This simplifies the dispatch logic and removes
the dependency on the worker registry lookup.

Changes:
- Get controlQueueName from first valid activity's WorkerControlTaskQueue
- Remove registry lookup and hardcoded queue name construction
- Update dispatchActivityCancelToWorker signature to accept queue name
- Update test to send WorkerControlTaskQueue in poll request

Author: rkannan82

service/history/transfer_queue_active_task_executor.go

@@ -2004,12 +2004,19 @@ func (t *transferQueueActiveTaskExecutor) processCancelActivityNexus(
 
 	// Build task tokens for all activities that still need cancellation
 	var taskTokens [][]byte
+	var controlQueueName string
 	for _, scheduledEventID := range task.ScheduledEventIDs {
 		ai, ok := mutableState.GetActivityInfo(scheduledEventID)
 		if !ok || !ai.CancelRequested || ai.StartedEventId == common.EmptyEventID {
 			continue
 		}
 
+		// Get control queue name from the first valid activity.
+		// All activities in a batch are from the same worker, so they have the same control queue.
+		if controlQueueName == "" {
+			controlQueueName = ai.WorkerControlTaskQueue
+		}
+
 		taskToken := &tokenspb.Task{
 			NamespaceId:      task.NamespaceID,
 			WorkflowId:       task.WorkflowID,
@@ -2027,25 +2034,19 @@ func (t *transferQueueActiveTaskExecutor) processCancelActivityNexus(
 		taskTokens = append(taskTokens, taskTokenBytes)
 	}
 
-	if len(taskTokens) == 0 {
+	if len(taskTokens) == 0 || controlQueueName == "" {
 		return nil
 	}
 
-	return t.dispatchActivityCancelToWorker(ctx, task, taskTokens)
+	return t.dispatchActivityCancelToWorker(ctx, task.NamespaceID, controlQueueName, taskTokens)
 }
 
 func (t *transferQueueActiveTaskExecutor) dispatchActivityCancelToWorker(
 	ctx context.Context,
-	task *tasks.CancelActivityNexusTask,
+	namespaceID string,
+	controlQueueName string,
 	taskTokens [][]byte,
 ) error {
-	nsName, err := t.shardContext.GetNamespaceRegistry().GetNamespaceName(namespace.ID(task.NamespaceID))
-	if err != nil {
-		return err
-	}
-	// TODO: Fetch control queue name from worker registry.
-	controlQueueName := fmt.Sprintf("/temporal-sys/worker-commands/%s/%s-nexus-queue", nsName, task.WorkerInstanceKey)
-
 	cancelPayload := &workerpb.CancelActivitiesRequestPayload{
 		TaskTokens: taskTokens,
 	}
@@ -2071,7 +2072,7 @@ func (t *transferQueueActiveTaskExecutor) dispatchActivityCancelToWorker(
 	}
 
 	resp, err := t.matchingRawClient.DispatchNexusTask(ctx, &matchingservice.DispatchNexusTaskRequest{
-		NamespaceId: task.NamespaceID,
+		NamespaceId: namespaceID,
 		TaskQueue: &taskqueuepb.TaskQueue{
 			Name: controlQueueName,
 			Kind: enumspb.TASK_QUEUE_KIND_NORMAL,
@@ -2080,17 +2081,14 @@ func (t *transferQueueActiveTaskExecutor) dispatchActivityCancelToWorker(
 	})
 	if err != nil {
 		t.logger.Warn("Failed to dispatch activity cancel to worker",
-			tag.WorkflowNamespaceID(task.NamespaceID),
-			tag.WorkflowID(task.WorkflowID),
-			tag.WorkflowRunID(task.RunID),
+			tag.NewStringTag("control_queue", controlQueueName),
 			tag.Error(err))
 		return err
 	}
 
 	if resp.GetRequestTimeout() != nil {
 		t.logger.Warn("No worker polling control queue for activity cancel",
-			tag.WorkflowNamespaceID(task.NamespaceID),
-			tag.WorkflowID(task.WorkflowID))
+			tag.NewStringTag("control_queue", controlQueueName))
 		return serviceerror.NewUnavailable("no worker polling control queue")
 	}
 

tests/cancel_running_activities_using_nexus_task_test.go

@@ -89,10 +89,11 @@ func (s *CancelRunningActivitiesUsingNexusTaskSuite) TestDispatchCancelToWorker(
 
 	// Poll for activity task and start running the activity.
 	activityPollResp, err := s.FrontendClient().PollActivityTaskQueue(ctx, &workflowservice.PollActivityTaskQueueRequest{
-		Namespace:         s.Namespace().String(),
-		TaskQueue:         tv.TaskQueue(),
-		Identity:          tv.WorkerIdentity(),
-		WorkerInstanceKey: tv.WorkerInstanceKey(),
+		Namespace:              s.Namespace().String(),
+		TaskQueue:              tv.TaskQueue(),
+		Identity:               tv.WorkerIdentity(),
+		WorkerInstanceKey:      tv.WorkerInstanceKey(),
+		WorkerControlTaskQueue: controlQueueName,
 	})
 	s.NoError(err)
 	s.NotNil(activityPollResp)