Adding a temporary flag to Bazel to allow Platform override from the command
line. This will be used during development to test new toolchains in docker
containers.
Example usage: --experimental_remote_platform_override='entry:{ name:"a" value:"b" } entry:{ name:"c" value:"d" }'
TESTED=local server
--
PiperOrigin-RevId: 149933081
MOS_MIGRATED_REVID=149933081
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteOptions.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteOptions.java
index ad2cde5..561c55e 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteOptions.java
@@ -130,4 +130,12 @@
help = "Whether to upload action results to the remote cache after executing locally."
)
public boolean remoteLocalExecUploadResults;
+
+ @Option(
+ name = "experimental_remote_platform_override",
+ defaultValue = "null",
+ category = "remote",
+ help = "Temporary, for testing only. Manually set a Platform to pass to remote execution."
+ )
+ public String experimentalRemotePlatformOverride;
}
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 86435ba..c4f788b 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
@@ -41,10 +41,13 @@
import com.google.devtools.build.lib.remote.RemoteProtocol.ExecuteReply;
import com.google.devtools.build.lib.remote.RemoteProtocol.ExecuteRequest;
import com.google.devtools.build.lib.remote.RemoteProtocol.ExecutionStatus;
+import com.google.devtools.build.lib.remote.RemoteProtocol.Platform;
import com.google.devtools.build.lib.remote.TreeNodeRepository.TreeNode;
import com.google.devtools.build.lib.standalone.StandaloneSpawnStrategy;
import com.google.devtools.build.lib.util.io.FileOutErr;
import com.google.devtools.build.lib.vfs.Path;
+import com.google.protobuf.TextFormat;
+import com.google.protobuf.TextFormat.ParseException;
import io.grpc.StatusRuntimeException;
import java.io.IOException;
import java.util.ArrayList;
@@ -66,6 +69,8 @@
private final StandaloneSpawnStrategy standaloneStrategy;
private final boolean verboseFailures;
private final RemoteOptions options;
+ // TODO(olaola): This will be set on a per-action basis instead.
+ private final Platform platform;
RemoteSpawnStrategy(
Map<String, String> clientEnv,
@@ -77,6 +82,17 @@
this.standaloneStrategy = new StandaloneSpawnStrategy(execRoot, verboseFailures, productName);
this.verboseFailures = verboseFailures;
this.options = options;
+ if (options.experimentalRemotePlatformOverride != null) {
+ Platform.Builder platformBuilder = Platform.newBuilder();
+ try {
+ TextFormat.getParser().merge(options.experimentalRemotePlatformOverride, platformBuilder);
+ } catch (ParseException e) {
+ throw new RuntimeException("Failed to parse --experimental_remote_platform_override", e);
+ }
+ platform = platformBuilder.build();
+ } else {
+ platform = null;
+ }
}
private Action buildAction(
@@ -88,7 +104,9 @@
for (ActionInput output : outputs) {
action.addOutputPath(output.getExecPathString());
}
- // TODO(olaola): Need to set platform as well!
+ if (platform != null) {
+ action.setPlatform(platform);
+ }
return action.build();
}
@@ -108,8 +126,11 @@
* remote action cache.
*/
private void execLocally(
- Spawn spawn, ActionExecutionContext actionExecutionContext, RemoteActionCache actionCache,
- ActionKey actionKey) throws ExecException, InterruptedException {
+ Spawn spawn,
+ ActionExecutionContext actionExecutionContext,
+ RemoteActionCache actionCache,
+ ActionKey actionKey)
+ throws ExecException, InterruptedException {
standaloneStrategy.exec(spawn, actionExecutionContext);
if (options.remoteLocalExecUploadResults && actionCache != null && actionKey != null) {
ArrayList<Path> outputFiles = new ArrayList<>();
@@ -142,8 +163,8 @@
private static void passRemoteOutErr(
RemoteActionCache cache, ActionResult result, FileOutErr outErr) {
try {
- ImmutableList<byte[]> streams = cache.downloadBlobs(
- ImmutableList.of(result.getStdoutDigest(), result.getStderrDigest()));
+ ImmutableList<byte[]> streams =
+ cache.downloadBlobs(ImmutableList.of(result.getStdoutDigest(), result.getStderrDigest()));
outErr.printOut(new String(streams.get(0), UTF_8));
outErr.printErr(new String(streams.get(1), UTF_8));
} catch (CacheNotFoundException e) {
@@ -216,8 +237,8 @@
// Look up action cache, and reuse the action output if it is found.
actionKey = ContentDigests.computeActionKey(action);
- ActionResult result = this.options.remoteAcceptCached
- ? actionCache.getCachedActionResult(actionKey) : null;
+ ActionResult result =
+ this.options.remoteAcceptCached ? actionCache.getCachedActionResult(actionKey) : null;
boolean acceptCachedResult = this.options.remoteAcceptCached;
if (result != null) {
// We don't cache failed actions, so we know the outputs exist.
