Allow the remote server to set its own default action timeout when Bazel does not have one. Hardcoded value of 120 seconds is clearly a mistake.

TESTED=remote worker
PiperOrigin-RevId: 160891214

1 files changed, 2 insertions, 11 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/actions/Spawns.java b/src/main/java/com/google/devtools/build/lib/actions/Spawns.java
index be4a0db1ad..35cfd5568e 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/Spawns.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/Spawns.java
@@ -25,21 +25,12 @@ public final class Spawns {
   private Spawns() {}
 
   /**
-   * Parse the timeout key in the spawn execution info, if it exists. Return -1 if the key does not
-   * exist.
+   * Parse the timeout key in the spawn execution info, if it exists. Otherwise, return -1.
    */
   public static int getTimeoutSeconds(Spawn spawn) throws ExecException {
-    return getTimeoutSeconds(spawn, -1);
-  }
-
-  /**
-   * Parse the timeout key in the spawn execution info, if it exists. Otherwise, return the given
-   * default timeout.
-   */
-  public static int getTimeoutSeconds(Spawn spawn, int defaultTimeout) throws ExecException {
     String timeoutStr = spawn.getExecutionInfo().get("timeout");
     if (timeoutStr == null) {
-      return defaultTimeout;
+      return -1;
     }
     try {
       return Integer.parseInt(timeoutStr);