diff options
author | 2017-05-19 17:30:10 +0200 | |
---|---|---|
committer | 2017-05-22 14:37:43 +0200 | |
commit | c30b38e2aa05defb08c4152b1e6e0eee5c63a792 (patch) | |
tree | 9b049120e180a68abc138dca770d1910f0593cce /src/main/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutor.java | |
parent | 31dbadf4e86146af90bd5a1a5dfccc046c960d76 (diff) |
Remote+BES: Stabilize command line flags.
Update the command line flags used by remote execution/caching as well as the
build event service (BES).
Major changes:
- Remote execution/caching and BES share flags for authentication and TLS.
- Removed API Key authentication from BES, as it's not being used.
- Add TLS support to BES upload.
- Add --bes_project_id flag. If set, the value is propagated as part of BES
lifecycle events.
For reviewers:
Start your review at CommonRemoteAndBesOptions, BuildEventServiceOptions and
RemoteOptions. The other changes are mostly automatic IDE renames of fields and
flag updates in shell script tests.
RELNOTES: None.
PiperOrigin-RevId: 156553857
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutor.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutor.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutor.java b/src/main/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutor.java index 1812d8f4f0..eb79c91919 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutor.java +++ b/src/main/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutor.java @@ -25,7 +25,7 @@ import java.util.Iterator; @ThreadSafe public class GrpcRemoteExecutor extends GrpcActionCache { public static boolean isRemoteExecutionOptions(RemoteOptions options) { - return options.remoteWorker != null; + return options.remoteExecutor != null; } private final GrpcExecutionInterface executionIface; @@ -43,11 +43,11 @@ public class GrpcRemoteExecutor extends GrpcActionCache { ManagedChannel channel, ChannelOptions channelOptions, RemoteOptions options) { super( options, - GrpcInterfaces.casInterface(options.grpcTimeoutSeconds, channel, channelOptions), + GrpcInterfaces.casInterface(options.remoteTimeout, channel, channelOptions), GrpcInterfaces.executionCacheInterface( - options.grpcTimeoutSeconds, channel, channelOptions)); + options.remoteTimeout, channel, channelOptions)); this.executionIface = - GrpcInterfaces.executionInterface(options.grpcTimeoutSeconds, channel, channelOptions); + GrpcInterfaces.executionInterface(options.remoteTimeout, channel, channelOptions); } public ExecuteReply executeRemotely(ExecuteRequest request) { |