aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java
diff options
context:
space:
mode:
authorGravatar olaola <olaola@google.com>2017-09-20 21:29:07 +0200
committerGravatar László Csomor <laszlocsomor@google.com>2017-09-21 11:03:12 +0200
commitbe9ecf97375a93b28d192b904345884da4c864c0 (patch)
treed62a56c0e3e80b530ea5d97f14e2fcc651b69394 /src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java
parentbc66d0422c2a5a6066107fe7e8ed71e61bab5ce1 (diff)
Removing deprecated field total_input_file_count.
See API Revisions design doc: https://docs.google.com/document/d/12c3oAPgedckLpue2yj0xGgJTEOyUm4mXWWBJ157J-8I/edit#heading=h.llz6ymkp07b1 The BuildInfo is now sent via RequestMetadata. TESTED=we never used this field PiperOrigin-RevId: 169432884
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java21
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,