commit edb893d13f621731e20341378223b7432b4f333f
author Googler <noreply@google.com> Thu Jun 18 11:16:15 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Jun 18 11:22:15 2020 -0700
tree 5ae2d28be9fa7ac28efe90af5efac007e8cb7fdf
parent 2a4c6e335cbfe43d973b6804798002250a8e806d

Include worker-key-mnemonic when copying the execution_requirements into the execution info.

This key allows the sharing of workers between actions with different mnemonics. Note the problematic filtering occurs in registerStarlarkAction in StarlarkActionFactory.java.

PiperOrigin-RevId: 317141655

src/main/java/com/google/devtools/build/lib/packages/BUILD

diff --git a/src/main/java/com/google/devtools/build/lib/packages/BUILD b/src/main/java/com/google/devtools/build/lib/packages/BUILD
index 93313ad..03d8627 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/packages/BUILD
@@ -33,6 +33,7 @@
     deps = [
         ":build_type",
         ":type",
+        "//src/main/java/com/google/devtools/build/lib/actions:execution_requirements",
         "//src/main/java/com/google/devtools/build/lib/analysis:config/config_matching_provider",
         "//src/main/java/com/google/devtools/build/lib/analysis:config/transitions/configuration_transition",
         "//src/main/java/com/google/devtools/build/lib/analysis:config/transitions/no_transition",
@@ -65,7 +66,6 @@
         "//src/main/java/net/starlark/java/spelling",
         "//src/main/protobuf:build_java_proto",
         "//third_party:auto_value",
-        "//third_party:flogger",
         "//third_party:guava",
         "//third_party:jsr305",
         "//third_party/protobuf:protobuf_java",

src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java b/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java
index 2c964ef..25e053a 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java
@@ -22,6 +22,7 @@
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
+import com.google.devtools.build.lib.actions.ExecutionRequirements;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.syntax.Dict;
 import com.google.devtools.build.lib.syntax.EvalException;
@@ -53,8 +54,9 @@
         || tag.startsWith("no-")
         || tag.startsWith("supports-")
         || tag.startsWith("disable-")
-        || tag.equals("local")
-        || tag.startsWith("cpu:");
+        || tag.startsWith("cpu:")
+        || tag.equals(ExecutionRequirements.LOCAL)
+        || tag.equals(ExecutionRequirements.WORKER_KEY_MNEMONIC);
   }
 
   private TargetUtils() {} // Uninstantiable.