Merged PR 675990: Fix a crash caused by pip cancellation

Fix a crash caused by pip cancellation Related work items: #1968695, #1980181
microsoft · Aug 22, 2022 · 150ccab · 150ccab
1 parent 80769b2
commit 150ccab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/Public/Src/Engine/Scheduler/ExecutionResult.cs b/Public/Src/Engine/Scheduler/ExecutionResult.cs
@@ -674,18 +674,6 @@ public static ExecutionResult GetFailureNotRunResult(LoggingContext loggingConte
             return result;
         }
 
-        /// <summary>
-        /// Gets a cancelled result without run information.
-        /// </summary>
-        public static ExecutionResult GetCancelledNotRunResult(LoggingContext loggingContext)
-        {
-            var result = new ExecutionResult();
-            result.SetResult(loggingContext, PipResultStatus.Canceled);
-            result.Seal();
-
-            return result;
-        }
-
         /// <summary>
         /// Gets a failure result for testing purposes.
         /// </summary>

diff --git a/Public/Src/Engine/Scheduler/RunnablePip.cs b/Public/Src/Engine/Scheduler/RunnablePip.cs
@@ -329,7 +329,8 @@ public PipExecutionStep Cancel()
             // Make sure that ExecutionResult is always initialized.
             if ((PipType == PipType.Process || PipType == PipType.Ipc) && ExecutionResult == null)
             {
-                SetExecutionResult(ExecutionResult.GetCancelledNotRunResult(LoggingContext));
+                Contract.Assert(Environment.IsTerminating, "Attempted to cancel a pip prior its execution but the scheduler is not terminating.");
+                SetExecutionResult(ExecutionResult.GetRetryableNotRunResult(LoggingContext, RetryInfo.GetDefault(RetryReason.StoppedWorker)));
             }
 
             return PipExecutionStep.Cancel;