Proactively cancel activities on workflow close (termination, timeout, etc) - #10047
Merged
Conversation
rkannan82
force-pushed
the
kannan/cancel-activity-on-terminate
branch
from
May 4, 2026 18:23
3f50b28 to
2802499
Compare
When a workflow is terminated or times out, dispatch cancel commands to workers for in-flight activities that registered a control queue. Extends the mechanism from #9233 to cover forceful workflow close scenarios (including reset, which terminates the old run). Guarded by EnableCancelActivityWorkerCommand. Disabled by default. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
rkannan82
force-pushed
the
kannan/cancel-activity-on-terminate
branch
from
May 4, 2026 18:25
2802499 to
69daa0c
Compare
rkannan82
marked this pull request as ready for review
May 4, 2026 18:25
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
yycptt
reviewed
May 11, 2026
Cancel commands for in-flight activities are now generated from GenerateWorkflowCloseTasks instead of being called explicitly from TerminateWorkflow and TimeoutWorkflow. This covers all workflow close paths (complete, fail, timeout, cancel, terminate, continue-as-new) with a single call site. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
rkannan82
changed the title
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Cancel commands are best-effort and only dispatched on the active cluster. Avoid creating tasks on standby that will be immediately dropped by the outbound executor. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
yycptt
approved these changes
May 15, 2026
trangnguyenkp
pushed a commit
to trangnguyenkp/temporal
that referenced
this pull request
Jul 9, 2026
…, etc) (temporalio#10047) ## What On workflow close, dispatch cancel-commands to workers for in-flight activities. Extends the mechanism from temporalio#9233 to cover all workflow close paths. Cancel command generation lives in `GenerateWorkflowCloseTasks`, which is called from every close path (complete, fail, timeout, cancel, terminate, continue-as-new). Guarded by `EnableCancelActivityWorkerCommand` (disabled). ## Why Previously, workers only discovered workflow termination/timeout passively via heartbeat (`NOT_FOUND`) or when completing the activity. If heartbeat isn't enabled, activities run to completion uselessly. ## How did you test it? - Unit tests covering filtering logic (control queue, started clock, feature flag) and multi-queue batching. - E2E tests for terminate, reset, CaN. --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
On workflow close, dispatch cancel-commands to workers for in-flight activities. Extends the mechanism from #9233 to cover all workflow close paths.
Cancel command generation lives in
GenerateWorkflowCloseTasks, which is called from every close path (complete, fail, timeout, cancel, terminate, continue-as-new). Guarded byEnableCancelActivityWorkerCommand(disabled).Why
Previously, workers only discovered workflow termination/timeout passively via heartbeat (
NOT_FOUND) or when completing the activity. If heartbeat isn't enabled, activities run to completion uselessly.How did you test it?