Refactoring getTimeoutSeconds of a Spawn into Spaws.java, becaused it is used

in places other than the sandbox code.

--
MOS_MIGRATED_REVID=132436150

1 files changed, 3 insertions, 10 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java
index fe388f7b26..2244ca73cc 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java
@@ -28,6 +28,7 @@ import com.google.devtools.build.lib.actions.ExecutionStrategy;
 import com.google.devtools.build.lib.actions.Executor;
 import com.google.devtools.build.lib.actions.Spawn;
 import com.google.devtools.build.lib.actions.SpawnActionContext;
+import com.google.devtools.build.lib.actions.Spawns;
 import com.google.devtools.build.lib.actions.UserExecException;
 import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.events.EventHandler;
@@ -125,15 +126,7 @@ final class RemoteSpawnStrategy implements SpawnActionContext {
     String actionOutputKey = hasher.hash().toString();
 
     // Timeout for running the remote spawn.
-    int timeout = 120;
-    String timeoutStr = spawn.getExecutionInfo().get("timeout");
-    if (timeoutStr != null) {
-      try {
-        timeout = Integer.parseInt(timeoutStr);
-      } catch (NumberFormatException e) {
-        throw new UserExecException("could not parse timeout: ", e);
-      }
-    }
+    final int timeoutSeconds = Spawns.getTimeoutSeconds(spawn, 120);
 
     try {
       // Look up action cache using |actionOutputKey|. Reuse the action output if it is found.
@@ -150,7 +143,7 @@ final class RemoteSpawnStrategy implements SpawnActionContext {
           inputs,
           spawn.getEnvironment(),
           spawn.getOutputFiles(),
-          timeout,
+          timeoutSeconds,
           eventHandler,
           outErr)) {
         return;