Skip to content

Commit 2cb3108

Browse files
committed
Remove worker_instance_key as it is not needed
1 parent 71fa657 commit 2cb3108

File tree

6 files changed

+7
-24
lines changed

6 files changed

+7
-24
lines changed

api/persistence/v1/executions.pb.go

Lines changed: 4 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

common/persistence/serialization/task_serializers.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ func transferCancelActivityNexusTaskToProto(task *tasks.CancelActivityNexusTask)
122122
TaskDetails: &persistencespb.TransferTaskInfo_CancelActivityNexusTaskDetails_{
123123
CancelActivityNexusTaskDetails: &persistencespb.TransferTaskInfo_CancelActivityNexusTaskDetails{
124124
ScheduledEventIds: task.ScheduledEventIDs,
125-
WorkerInstanceKey: task.WorkerInstanceKey,
126125
},
127126
},
128127
}
@@ -140,7 +139,6 @@ func transferCancelActivityNexusTaskFromProto(task *persistencespb.TransferTaskI
140139
TaskID: task.TaskId,
141140
Version: task.Version,
142141
ScheduledEventIDs: details.GetScheduledEventIds(),
143-
WorkerInstanceKey: details.GetWorkerInstanceKey(),
144142
}
145143
}
146144

common/persistence/serialization/task_serializers_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ func (s *taskSerializerSuite) TestTransferCancelActivityNexusTask() {
176176
TaskID: rand.Int63(),
177177
Version: rand.Int63(),
178178
ScheduledEventIDs: []int64{rand.Int63(), rand.Int63(), rand.Int63()},
179-
WorkerInstanceKey: "test-worker-instance-key",
180179
}
181180

182181
s.assertEqualTasks(cancelActivityNexusTask)

proto/internal/temporal/server/api/persistence/v1/executions.proto

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,11 +350,10 @@ message TransferTaskInfo {
350350
bool can_skip_visibility_archival = 1;
351351
}
352352

353-
// Details for a Nexus task that cancels activities belonging to a specific worker.
353+
// Details for a Nexus task that cancels activities.
354354
message CancelActivityNexusTaskDetails {
355355
// Scheduled event IDs of activities to cancel.
356356
repeated int64 scheduled_event_ids = 1;
357-
string worker_instance_key = 2;
358357
}
359358

360359
oneof task_details {

service/history/api/respondworkflowtaskcompleted/workflow_task_completed_handler.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -665,12 +665,11 @@ func (handler *workflowTaskCompletedHandler) handleCommandRequestCancelActivity(
665665
return nil, err
666666
}
667667
handler.activityNotStartedCancelled = true
668-
} else if ai.WorkerInstanceKey != "" && handler.config.EnableActivityCancellationNexusTask() {
668+
} else if ai.WorkerControlTaskQueue != "" && handler.config.EnableActivityCancellationNexusTask() {
669669
// Activity has started and worker supports Nexus tasks - create cancel task.
670670
handler.mutableState.AddTasks(&tasks.CancelActivityNexusTask{
671671
WorkflowKey: handler.mutableState.GetWorkflowKey(),
672672
ScheduledEventIDs: []int64{ai.ScheduledEventId},
673-
WorkerInstanceKey: ai.WorkerInstanceKey,
674673
})
675674
}
676675
}

service/history/tasks/cancel_activity_nexus_task.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ type (
1919

2020
// ScheduledEventIDs of activities to cancel (batched by worker).
2121
ScheduledEventIDs []int64
22-
WorkerInstanceKey string
2322
}
2423
)
2524

@@ -60,12 +59,11 @@ func (t *CancelActivityNexusTask) GetType() enumsspb.TaskType {
6059
}
6160

6261
func (t *CancelActivityNexusTask) String() string {
63-
return fmt.Sprintf("CancelActivityNexusTask{WorkflowKey: %s, VisibilityTimestamp: %v, TaskID: %v, ScheduledEventIDs: %v, WorkerInstanceKey: %v, Version: %v}",
62+
return fmt.Sprintf("CancelActivityNexusTask{WorkflowKey: %s, VisibilityTimestamp: %v, TaskID: %v, ScheduledEventIDs: %v, Version: %v}",
6463
t.WorkflowKey.String(),
6564
t.VisibilityTimestamp,
6665
t.TaskID,
6766
t.ScheduledEventIDs,
68-
t.WorkerInstanceKey,
6967
t.Version,
7068
)
7169
}

0 commit comments

Comments
 (0)