Skip to content

Commit 96a3433

Browse files
committed
Merged PR 717002: Disable runningPips assertion in cancelled builds
1 parent b404d23 commit 96a3433

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Public/Src/Engine/Scheduler/Scheduler.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1654,10 +1654,10 @@ public async Task<bool> WhenDone()
16541654

16551655
Contract.Assert(!HasFailed || m_executePhaseLoggingContext.ErrorWasLogged, "Scheduler encountered errors during execution, but none were logged.");
16561656

1657-
if (!IsDistributedWorker && !HasFailed)
1657+
if (!IsDistributedWorker && !HasFailed && !m_schedulerCancellationTokenSource.IsCancellationRequested)
16581658
{
1659-
RetrievePipStateCounts(out _, out _, out _, out long runningPips, out _, out _, out _, out _);
1660-
Contract.Assert(runningPips == 0, "There are still pips at running state at the end of the build.");
1659+
RetrievePipStateCounts(out _, out _, out long waitingPips, out long runningPips, out _, out long failedPips, out long skippedPips, out _);
1660+
Contract.Assert(runningPips == 0, $"There are still pips at running state at the end of the build. WaitingPips: {waitingPips}, RunningPips: {runningPips}, FailedPips: {failedPips}, SkippedPips: {skippedPips}.");
16611661
}
16621662

16631663
// We want TimeToFirstPipExecuted to always have a value. Mark the end of the execute phase as when the first

0 commit comments

Comments
 (0)