commit d5d65ec3410e9228f92ba77b730c542f399fec47
author larsrc <larsrc@google.com> Thu Sep 24 09:33:49 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Sep 24 09:35:10 2020 -0700
tree 3d11e4c28bfdb0338e7650e87bb62d2a09804e4e
parent d8caf2699ebbf1f0486921929d7ef9adfc43b8c7

Automated rollback of commit aab567cbde4f1817b598207d99a93393dad4a094.

*** Reason for rollback ***

Saw regression of 10% on a normal machine, up to 50% on a manycore machine.

*** Original change description ***

Turns on multiplex workers in Java toolchain rule.

RELNOTES: Javac now supports multiplex workers.
PiperOrigin-RevId: 333531421

src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java
index a5b2c42..f171a03 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java
@@ -112,7 +112,7 @@
         /* <!-- #BLAZE_RULE(java_toolchain).ATTRIBUTE(javac_supports_multiplex_workers) -->
         True if JavaBuilder supports running as a multiplex persistent worker, false if it doesn't.
         <!-- #END_BLAZE_RULE.ATTRIBUTE --> */
-        .add(attr("javac_supports_multiplex_workers", BOOLEAN).value(true))
+        .add(attr("javac_supports_multiplex_workers", BOOLEAN).value(false))
         /* <!-- #BLAZE_RULE(java_toolchain).ATTRIBUTE(javac) -->
         Label of the javac jar.
         <!-- #END_BLAZE_RULE.ATTRIBUTE --> */

src/test/java/com/google/devtools/build/lib/worker/ExampleWorker.java

diff --git a/src/test/java/com/google/devtools/build/lib/worker/ExampleWorker.java b/src/test/java/com/google/devtools/build/lib/worker/ExampleWorker.java
index 16fe7d9..7a31a62 100644
--- a/src/test/java/com/google/devtools/build/lib/worker/ExampleWorker.java
+++ b/src/test/java/com/google/devtools/build/lib/worker/ExampleWorker.java
@@ -138,11 +138,7 @@
           System.out.flush();
         } else {
           WorkResponse response =
-              WorkResponse.newBuilder()
-                  .setOutput(baos.toString())
-                  .setExitCode(exitCode)
-                  .setRequestId(request.getRequestId())
-                  .build();
+              WorkResponse.newBuilder().setOutput(baos.toString()).setExitCode(exitCode).build();
           workerProtocol.writeResponse(response);
         }
 

src/test/shell/integration/bazel_worker_test.sh

diff --git a/src/test/shell/integration/bazel_worker_test.sh b/src/test/shell/integration/bazel_worker_test.sh
index 5e2208c..9b4f11c 100755
--- a/src/test/shell/integration/bazel_worker_test.sh
+++ b/src/test/shell/integration/bazel_worker_test.sh
@@ -38,7 +38,6 @@
 add_to_bazelrc "build --experimental_allow_json_worker_protocol"
 add_to_bazelrc "build --worker_verbose --worker_max_instances=1"
 add_to_bazelrc "build --debug_print_action_contexts"
-add_to_bazelrc "build --noexperimental_worker_multiplex"
 add_to_bazelrc "build ${ADDITIONAL_BUILD_FLAGS}"
 
 function set_up() {