Skip to content

Commit 767212a

Browse files
committed
Revert "Merged PR 696346: Upon CB timeout, trigger the cancellation token before logging internal error to avoid a small race"
This reverts commit 89617b2.
1 parent 6fd62a3 commit 767212a

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

Public/Src/App/Bxl/BuildXLApp.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2701,12 +2701,11 @@ private async Task CbTimeoutCleanExitAsync(int earlyCbTimeoutMins, int msUntilTi
27012701
}
27022702

27032703
await Task.Delay(msUntilTimeout);
2704-
m_cancellationSource.Cancel();
2705-
27062704
Logger.Log.CbTimeoutReached(
27072705
m_appLoggingContext,
27082706
earlyCbTimeoutMins,
27092707
Convert.ToInt32(TimeSpan.FromMilliseconds(msUntilTimeout).TotalMinutes));
2708+
m_cancellationSource.Cancel();
27102709
}
27112710
}
27122711

Public/Src/Utilities/Configuration/IScheduleConfiguration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public partial interface IScheduleConfiguration
4040
bool StopOnFirstError { get; }
4141

4242
/// <summary>
43-
/// Stops the build engine the first time an internal error is generated by BuildXL. Does not apply to user errors
43+
/// Stops the build engine the first time an internal error is generated by either BuildXL. Does not apply to user errors
4444
/// </summary>
4545
/// <remarks>
4646
/// Technically this applies to infrastructure errors as well

0 commit comments

Comments
 (0)