Skip to content

Commit

Permalink
Revert "Merged PR 696346: Upon CB timeout, trigger the cancellation t…
Browse files Browse the repository at this point in the history
…oken before logging internal error to avoid a small race"

This reverts commit 89617b2.
  • Loading branch information
marcelolynch committed Jan 25, 2023
1 parent 6fd62a3 commit 767212a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions Public/Src/App/Bxl/BuildXLApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 767212a

Please sign in to comment.