diff options
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java index f4babd76a1..6fcce64ad0 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java +++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java @@ -173,7 +173,13 @@ class RemoteSpawnRunner implements SpawnRunner { final ActionResult result; try { - result = executeRemotely(action, inputMap.size(), acceptCachedResult); + ExecuteRequest.Builder request = + ExecuteRequest.newBuilder() + .setInstanceName(options.remoteInstanceName) + .setAction(action) + .setSkipCacheLookup(!acceptCachedResult); + ExecuteResponse reply = remoteExecutor.executeRemotely(request.build()); + result = reply.getResult(); } catch (IOException e) { return execLocallyOrFail(spawn, policy, inputMap, actionKey, uploadLocalResults, e); } @@ -202,19 +208,6 @@ class RemoteSpawnRunner implements SpawnRunner { .build(); } - private ActionResult executeRemotely(Action action, int numInputFiles, boolean acceptCachedResult) - throws IOException, InterruptedException { - // TODO(olaola): set BuildInfo and input total bytes as well. - ExecuteRequest.Builder request = - ExecuteRequest.newBuilder() - .setInstanceName(options.remoteInstanceName) - .setAction(action) - .setTotalInputFileCount(numInputFiles) - .setSkipCacheLookup(!acceptCachedResult); - ExecuteResponse reply = remoteExecutor.executeRemotely(request.build()); - return reply.getResult(); - } - private SpawnResult execLocallyOrFail( Spawn spawn, SpawnExecutionPolicy policy, |