Merged PR 717018: Catch InvalidOperationException inside RemoteWorker

Author: semihokur

Public/Src/Engine/Dll/Distribution/RemoteWorker.cs

@@ -236,10 +236,18 @@ private void SendBuildRequests()
                     m_pipCompletionTaskList.Add(firstItem.Item1);
                     m_buildRequestList.Add(firstItem.Item2);
 
-                    while (m_buildRequestList.Count < MaxMessagesPerBatch && m_buildRequests.TryTake(out var item, EngineEnvironmentSettings.RemoteWorkerSendBuildRequestTimeoutMs.Value ?? 0))
+                    try
                     {
-                        m_pipCompletionTaskList.Add(item.Item1);
-                        m_buildRequestList.Add(item.Item2);
+                        while (m_buildRequestList.Count < MaxMessagesPerBatch && m_buildRequests.TryTake(out var item, EngineEnvironmentSettings.RemoteWorkerSendBuildRequestTimeoutMs.Value ?? 0))
+                        {
+                            m_pipCompletionTaskList.Add(item.Item1);
+                            m_buildRequestList.Add(item.Item2);
+                        }
+                    }
+                    catch (InvalidOperationException)
+                    {
+                        // We might have disconnected the worker. We should check the loop condition (buildRequests.IsCompleted) again.
+                        continue;
                     }
 
                     m_currentBatchSize = m_pipCompletionTaskList.Count;