commit 02d5a546500e653c86a19663073d922abe274239
author mschaller <mschaller@google.com> Thu Feb 20 09:08:35 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Feb 20 09:09:38 2020 -0800
tree 37baf084fe230e8846b071b5a0f73061a6f8bcf3
parent 281dc9dcd633eb282fbbec11449446fd64d3206d

Adds SpawnResult.Status.EXECUTION_DENIED_CATASTROPHICALLY

For spawn executions that fail badly enough that the build should stop
and for reasons suspected to be caused by the user.

RELNOTES: None.
PiperOrigin-RevId: 296223924

src/main/java/com/google/devtools/build/lib/actions/SpawnResult.java

diff --git a/src/main/java/com/google/devtools/build/lib/actions/SpawnResult.java b/src/main/java/com/google/devtools/build/lib/actions/SpawnResult.java
index 6054f65..10e9845 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/SpawnResult.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/SpawnResult.java
@@ -63,12 +63,19 @@
     EXECUTION_FAILED_CATASTROPHICALLY,
 
     /**
-     * Subprocess did not execute, and it may be the user's fault. The user may be able to fix it.
-     * For example, a remote system may have denied the execution due to too many inputs or too
-     * large inputs.
+     * Subprocess did not execute, it may be the user's fault, and the error is not catastrophic.
+     * The user may be able to fix it. For example, a remote system may have denied the execution
+     * due to too many inputs or too large inputs.
      */
     EXECUTION_DENIED(true),
 
+    /**
+     * Subprocess did not execute, it may be the user's fault, and the error is catastrophic. The
+     * user may be able to prevent it from reoccurring. For example, an input file's contents may
+     * have been modified by the user intra-build.
+     */
+    EXECUTION_DENIED_CATASTROPHICALLY(true),
+
     /** The remote execution system is overloaded and had to refuse execution for this Spawn. */
     REMOTE_EXECUTOR_OVERLOADED,
 
@@ -109,9 +116,13 @@
         || status == Status.OUT_OF_MEMORY;
   }
 
-  /** Returns true if the status was {@link Status#EXECUTION_FAILED_CATASTROPHICALLY}. */
+  /**
+   * Returns true if the status was {@link Status#EXECUTION_FAILED_CATASTROPHICALLY} or {@link
+   * Status#EXECUTION_DENIED_CATASTROPHICALLY}.
+   */
   default boolean isCatastrophe() {
-    return status() == Status.EXECUTION_FAILED_CATASTROPHICALLY;
+    return status() == Status.EXECUTION_FAILED_CATASTROPHICALLY
+        || status() == Status.EXECUTION_DENIED_CATASTROPHICALLY;
   }
 
   /** Returns the status of the attempted Spawn execution. */