Skip to content

Fix publisher deadlock when workspace child resources are published in commit mode (#838) #841

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

Open
michelversluijs wants to merge 1 commit into
base: v7
Choose a base branch
from
Open

Fix publisher deadlock when workspace child resources are published in commit mode (#838) #841

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
12 changes: 8 additions & 4 deletions src/publisher/Publisher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,13 @@ await predecessors.IterTaskParallel(async predecessor => await processResource(p

async ValueTask processDelete()
{
// Skip if not actually being deleted this run (e.g. WorkspaceResource has no artifact file).
// Cascading to successors here would deadlock with their processPut tasks.
if (resourceSet.Contains(resourceKey) is false)
{
return;
}

// Process successors first
var successors = previousRelationships.Successors
.Find(resourceKey)
Expand All @@ -108,10 +115,7 @@ await successors.IterTaskParallel(async successor => await processResource(succe
cancellationToken);

// Delete resource
if (resourceSet.Contains(resourceKey))
{
await deleteResource(resourceKey, cancellationToken);
}
await deleteResource(resourceKey, cancellationToken);
}
}
}
Expand Down