Skip to content

Fix defer race-condition in WorkScheduler #9166

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
michaelstaib merged 1 commit into from
Feb 20, 2026
Merged

Fix defer race-condition in WorkScheduler #9166

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
11 changes: 9 additions & 2 deletions src/HotChocolate/Core/src/Types/Execution/Processing/WorkScheduler.Execute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,15 @@ public ValueTask WaitForCompletionAsync(int executionBranchId)
{
AssertNotPooled();

return _activeBranches.TryGetValue(executionBranchId, out var branch)
? branch.WaitForCompletionAsync(operationContext.RequestAborted)
Branch? branch;

lock (_sync)
{
_activeBranches.TryGetValue(executionBranchId, out branch);
}

return branch is not null
? branch.WaitForCompletionAsync(_ct)
: ValueTask.CompletedTask;
}

Expand Down
Loading