Revert "Merged PR 696346: Upon CB timeout, trigger the cancellation t…

…oken before logging internal error to avoid a small race" This reverts commit 89617b2.
microsoft · Jan 25, 2023 · 767212a · 767212a
1 parent 6fd62a3
commit 767212a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Public/Src/App/Bxl/BuildXLApp.cs b/Public/Src/App/Bxl/BuildXLApp.cs
@@ -2701,12 +2701,11 @@ private async Task CbTimeoutCleanExitAsync(int earlyCbTimeoutMins, int msUntilTi
             }
 
             await Task.Delay(msUntilTimeout);
-            m_cancellationSource.Cancel();
-
             Logger.Log.CbTimeoutReached(
                 m_appLoggingContext,
                 earlyCbTimeoutMins,
                 Convert.ToInt32(TimeSpan.FromMilliseconds(msUntilTimeout).TotalMinutes));
+            m_cancellationSource.Cancel();
         }
     }
 

diff --git a/Public/Src/Utilities/Configuration/IScheduleConfiguration.cs b/Public/Src/Utilities/Configuration/IScheduleConfiguration.cs
@@ -40,7 +40,7 @@ public partial interface IScheduleConfiguration
         bool StopOnFirstError { get; }
 
         /// <summary>
-        /// Stops the build engine the first time an internal error is generated by BuildXL. Does not apply to user errors
+        /// Stops the build engine the first time an internal error is generated by either BuildXL. Does not apply to user errors
         /// </summary>
         /// <remarks>
         /// Technically this applies to infrastructure errors as well