Skip to content

Wait for ExecuteChildWorkflowAction to complete by default #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 18, 2025
Merged

Wait for ExecuteChildWorkflowAction to complete by default #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions loadgen/kitchen_sink_executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,20 +144,21 @@ func TestKitchenSink(t *testing.T) {
WorkflowType: "kitchenSink",
Input: []*common.Payload{
ConvertToPayload(&WorkflowInput{
InitialActions: ListActionSet(NewTimerAction(1 * time.Millisecond)),
InitialActions: ListActionSet(NewEmptyReturnResultAction()),
Copy link
Contributor

@THardy98 THardy98 Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this change for?

Copy link
Collaborator Author

@stephanos stephanos Nov 18, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without a ReturnResult action the workflow never returns. That's why it had the abandon policy on it before.

Error:      	Received unexpected error:
                	            	timed out while waiting for runs to complete: context deadline exceeded
                	Test:       	TestKitchenSink/ExecActivity/ExecChildWorkflow/go

})},
AwaitableChoice: &AwaitableChoice{
Condition: &AwaitableChoice_Abandon{
Abandon: &emptypb.Empty{},
},
},
},
},
}),
},
},
historyMatcher: PartialHistoryMatcher(`
StartChildWorkflowExecutionInitiated {"workflowId":"my-child"}`),
StartChildWorkflowExecutionInitiated {"workflowId":"my-child"}
ChildWorkflowExecutionStarted
WorkflowTaskScheduled
WorkflowTaskStarted
WorkflowTaskCompleted
ChildWorkflowExecutionCompleted
`),
},
{
name: "ExecActivity/Client/Signal/DoActions",
Expand Down
2 changes: 1 addition & 1 deletion workers/dotnet/Temporalio.Omes/KitchenSinkWorkflow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ private async Task HandleAwaitableChoiceAsync<T>(
}
else
{
await awaitableTask;
await afterCompletedFn(awaitableTask);
}
}
catch (Exception e) when (TemporalException.IsCanceledException(e))
Expand Down
2 changes: 1 addition & 1 deletion workers/python/kitchen_sink.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ async def handle_awaitable_choice(
task.cancel()
did_cancel = True
else:
await task
await after_completed_fn(task)
except asyncio.CancelledError:
if not did_cancel:
raise
Expand Down
2 changes: 1 addition & 1 deletion workers/typescript/src/workflows/kitchen_sink.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export async function kitchenSink(input: WorkflowInput | undefined): Promise<IPa
await afterCompleted(cancellablePromise);
cancelScope.cancel();
} else {
await cancellablePromise;
await afterCompleted(cancellablePromise);
}
}

Expand Down
Loading