Skip to content

Fix race condition in NodeProvideOutOfProcTaskHost #12708

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix race condition in NodeProvideOutOfProcTaskHost #12708

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: 6 additions & 6 deletions src/Build/BackEnd/Components/Communications/NodeProviderOutOfProcTaskHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@ internal class NodeProviderOutOfProcTaskHost : NodeProviderOutOfProcBase, INodeP
/// <summary>
/// A mapping of all of the INodePacketFactories wrapped by this provider.
/// </summary>
private IDictionary<int, INodePacketFactory> _nodeIdToPacketFactory;
private ConcurrentDictionary<int, INodePacketFactory> _nodeIdToPacketFactory;

/// <summary>
/// A mapping of all of the INodePacketHandlers wrapped by this provider.
/// </summary>
private IDictionary<int, INodePacketHandler> _nodeIdToPacketHandler;
private ConcurrentDictionary<int, INodePacketHandler> _nodeIdToPacketHandler;

/// <summary>
/// Keeps track of the set of nodes for which we have not yet received shutdown notification.
Expand Down Expand Up @@ -207,8 +207,8 @@ public void InitializeComponent(IBuildComponentHost host)
{
this.ComponentHost = host;
_nodeContexts = new ConcurrentDictionary<int, NodeContext>();
_nodeIdToPacketFactory = new Dictionary<int, INodePacketFactory>();
_nodeIdToPacketHandler = new Dictionary<int, INodePacketHandler>();
_nodeIdToPacketFactory = new ConcurrentDictionary<int, INodePacketFactory>();
_nodeIdToPacketHandler = new ConcurrentDictionary<int, INodePacketHandler>();
_activeNodes = new HashSet<int>();

_noNodesActiveEvent = new ManualResetEvent(true);
Expand Down Expand Up @@ -606,8 +606,8 @@ internal void DisconnectFromHost(int nodeId)
{
ErrorUtilities.VerifyThrow(_nodeIdToPacketFactory.ContainsKey(nodeId) && _nodeIdToPacketHandler.ContainsKey(nodeId), "Why are we trying to disconnect from a context that we already disconnected from? Did we call DisconnectFromHost twice?");

_nodeIdToPacketFactory.Remove(nodeId);
_nodeIdToPacketHandler.Remove(nodeId);
_nodeIdToPacketFactory.TryRemove(nodeId, out _);
_nodeIdToPacketHandler.TryRemove(nodeId, out _);
}

/// <summary>
Expand Down