Moving the RemoteWorker into tools/remote directory. This is because I want to add another remote execution related tool, the remote_client, which will use the Remote Execution API to fetch blobs from a remote cache. I will use this tool as part of end-to-end tests for remote execution. TESTED=remote integration tests, presubmit RELNOTES: None PiperOrigin-RevId: 177995895
diff --git a/scripts/ij.bazelproject b/scripts/ij.bazelproject index 65219b0..d1c6734 100644 --- a/scripts/ij.bazelproject +++ b/scripts/ij.bazelproject
@@ -19,4 +19,4 @@ //src/java_tools/singlejar:SingleJar //src/test/... -//src/test/docker/... - //src/tools/remote_worker + //src/tools/remote
diff --git a/src/BUILD b/src/BUILD index de49f41..31a6228 100644 --- a/src/BUILD +++ b/src/BUILD
@@ -17,7 +17,7 @@ }), visibility = [ "//src/test/java:__pkg__", - "//src/tools/remote_worker:__subpackages__", + "//src/tools/remote:__subpackages__", ], ) @@ -379,7 +379,7 @@ "//src/tools/xcode/stdredirect:srcs", "//src/tools/xcode/swiftstdlibtoolwrapper:srcs", "//src/tools/xcode-common:srcs", - "//src/tools/remote_worker:srcs", + "//src/tools/remote:srcs", "//tools/osx:srcs", ], visibility = ["//:__pkg__"],
diff --git a/src/main/java/com/google/devtools/build/lib/remote/README.md b/src/main/java/com/google/devtools/build/lib/remote/README.md index 0d53950..3c77037 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/README.md +++ b/src/main/java/com/google/devtools/build/lib/remote/README.md
@@ -127,11 +127,11 @@ Bazel currently provides a sample gRPC CAS implementation with a SimpleBlobStore as caching backend. To use it you need to clone from [Bazel](https://github.com/bazelbuild/bazel) and then build it with: ``` -bazel build //src/tools/remote_worker +bazel build //src/tools/remote:worker ``` The following command will then start the cache server listening on port 8080 using a local in-memory cache: ``` -bazel-bin/src/tools/remote_worker/remote_worker --listen_port=8080 +bazel-bin/src/tools/remote/worker --listen_port=8080 ```
diff --git a/src/main/java/com/google/devtools/build/lib/remote/SimpleBlobStoreActionCache.java b/src/main/java/com/google/devtools/build/lib/remote/SimpleBlobStoreActionCache.java index e5d32e4..db60846 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/SimpleBlobStoreActionCache.java +++ b/src/main/java/com/google/devtools/build/lib/remote/SimpleBlobStoreActionCache.java
@@ -48,7 +48,7 @@ * * <p>The thread safety is guaranteed by the underlying map. * - * <p>Note that this class is used from src/tools/remote_worker. + * <p>Note that this class is used from src/tools/remote. */ @ThreadSafe public final class SimpleBlobStoreActionCache implements RemoteActionCache {
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD index 71b103e..0ddc941 100644 --- a/src/test/shell/bazel/BUILD +++ b/src/test/shell/bazel/BUILD
@@ -416,7 +416,7 @@ srcs = ["remote_execution_test.sh"], data = [ ":test-deps", - "//src/tools/remote_worker", + "//src/tools/remote:worker", ], ) @@ -426,7 +426,7 @@ srcs = ["remote_execution_sandboxing_test.sh"], data = [ ":test-deps", - "//src/tools/remote_worker", + "//src/tools/remote:worker", ], )
diff --git a/src/test/shell/bazel/remote_execution_sandboxing_test.sh b/src/test/shell/bazel/remote_execution_sandboxing_test.sh index d21655a..dc3d4a0 100755 --- a/src/test/shell/bazel/remote_execution_sandboxing_test.sh +++ b/src/test/shell/bazel/remote_execution_sandboxing_test.sh
@@ -30,7 +30,7 @@ readonly_path=$(mktemp -d "${TEST_TMPDIR}/remote.XXXXXXXX") pid_file=$(mktemp -u "${TEST_TMPDIR}/remote.XXXXXXXX") worker_port=$(pick_random_unused_tcp_port) || fail "no port found" - "${bazel_data}/src/tools/remote_worker/remote_worker" \ + "${bazel_data}/src/tools/remote/worker" \ --work_path="${work_path}" \ --listen_port=${worker_port} \ --sandboxing \
diff --git a/src/test/shell/bazel/remote_execution_test.sh b/src/test/shell/bazel/remote_execution_test.sh index 601bcc9..a80acc7 100755 --- a/src/test/shell/bazel/remote_execution_test.sh +++ b/src/test/shell/bazel/remote_execution_test.sh
@@ -30,7 +30,7 @@ (( attempts++ )) worker_port=$(pick_random_unused_tcp_port) || fail "no port found" hazelcast_port=$(pick_random_unused_tcp_port) || fail "no port found" - "${bazel_data}/src/tools/remote_worker/remote_worker" \ + "${bazel_data}/src/tools/remote/worker" \ --work_path="${work_path}" \ --listen_port=${worker_port} \ --hazelcast_standalone_listen_port=${hazelcast_port} \
diff --git a/src/tools/remote/BUILD b/src/tools/remote/BUILD new file mode 100644 index 0000000..31ce3ec --- /dev/null +++ b/src/tools/remote/BUILD
@@ -0,0 +1,16 @@ +filegroup( + name = "srcs", + srcs = glob(["**"]) + ["//src/tools/remote/src/main/java/com/google/devtools/build/remote/worker:srcs"], + visibility = ["//src:__pkg__"], +) + +java_binary( + name = "worker", + jvm_flags = [ + # Enables REST for Hazelcast server for testing. + "-Dhazelcast.rest.enabled=true", + ], + main_class = "com.google.devtools.build.remote.worker.RemoteWorker", + visibility = ["//visibility:public"], + runtime_deps = ["//src/tools/remote/src/main/java/com/google/devtools/build/remote/worker"], +)
diff --git a/src/tools/remote_worker/README.md b/src/tools/remote/README.md similarity index 79% rename from src/tools/remote_worker/README.md rename to src/tools/remote/README.md index 408ab67..d662790 100644 --- a/src/tools/remote_worker/README.md +++ b/src/tools/remote/README.md
@@ -4,14 +4,14 @@ requests. It can work as a remote execution worker, a cache worker, or both. The simplest setup is as follows: -- First build remote_worker and run it. +- First build the worker and run it. - bazel build src/tools/remote_worker:all - bazel-bin/src/tools/remote_worker/remote_worker \ + bazel build src/tools/remote:all + bazel-bin/src/tools/remote/worker \ --work_path=/tmp/test \ --listen_port=8080 -- Then you run Bazel pointing to the remote_worker instance. +- Then you run Bazel pointing to the worker instance. bazel build \ --spawn_strategy=remote --remote_cache=localhost:8080 \ @@ -22,9 +22,9 @@ ## Sandboxing -If you run the remote_worker on Linux, you can also enable sandboxing for increased hermeticity: +If you run the worker on Linux, you can also enable sandboxing for increased hermeticity: - bazel-bin/src/tools/remote_worker/remote_worker \ + bazel-bin/src/tools/remote/worker \ --work_path=/tmp/test \ --listen_port=8080 \ --sandboxing \
diff --git a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/ActionCacheServer.java b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ActionCacheServer.java similarity index 97% rename from src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/ActionCacheServer.java rename to src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ActionCacheServer.java index 8e9ba2f..f440cad 100644 --- a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/ActionCacheServer.java +++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ActionCacheServer.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.remote; +package com.google.devtools.build.remote.worker; import static java.util.logging.Level.WARNING;
diff --git a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/BUILD b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/BUILD similarity index 92% rename from src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/BUILD rename to src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/BUILD index 8f36c4d..9918895 100644 --- a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/BUILD +++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/BUILD
@@ -1,15 +1,15 @@ filegroup( name = "srcs", srcs = glob(["**"]), - visibility = ["//src/tools/remote_worker:__pkg__"], + visibility = ["//src/tools/remote:__pkg__"], ) java_library( - name = "remote", + name = "worker", srcs = glob(["*.java"]), data = ["//src:libunix"], resources = ["//src/main/tools:linux-sandbox"], - visibility = ["//src/tools/remote_worker:__subpackages__"], + visibility = ["//src/tools/remote:__subpackages__"], deps = [ "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:os_util",
diff --git a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/ByteStreamServer.java b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ByteStreamServer.java similarity index 99% rename from src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/ByteStreamServer.java rename to src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ByteStreamServer.java index 778d743..ad3af5a 100644 --- a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/ByteStreamServer.java +++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ByteStreamServer.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.remote; +package com.google.devtools.build.remote.worker; import static java.util.logging.Level.SEVERE; import static java.util.logging.Level.WARNING;
diff --git a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/CasServer.java b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/CasServer.java similarity index 98% rename from src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/CasServer.java rename to src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/CasServer.java index 13e42b2..77325c5 100644 --- a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/CasServer.java +++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/CasServer.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.remote; +package com.google.devtools.build.remote.worker; import com.google.devtools.build.lib.remote.SimpleBlobStoreActionCache; import com.google.devtools.remoteexecution.v1test.BatchUpdateBlobsRequest;
diff --git a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/ExecutionServer.java b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ExecutionServer.java similarity index 99% rename from src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/ExecutionServer.java rename to src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ExecutionServer.java index 0b3f278..e80257b 100644 --- a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/ExecutionServer.java +++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ExecutionServer.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.remote; +package com.google.devtools.build.remote.worker; import static java.util.logging.Level.FINE; import static java.util.logging.Level.INFO;
diff --git a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/RemoteWorker.java b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/RemoteWorker.java similarity index 98% rename from src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/RemoteWorker.java rename to src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/RemoteWorker.java index c05076a..b49df47 100644 --- a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/RemoteWorker.java +++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/RemoteWorker.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.remote; +package com.google.devtools.build.remote.worker; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.logging.Level.FINE; @@ -298,7 +298,7 @@ if (sandbox == null) { logger.severe( "Sandboxing requested, but could not find bundled linux-sandbox binary. " - + "Please rebuild a remote_worker_deploy.jar on Linux to make this work."); + + "Please rebuild a worker_deploy.jar on Linux to make this work."); System.exit(1); }
diff --git a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/RemoteWorkerOptions.java b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/RemoteWorkerOptions.java similarity index 98% rename from src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/RemoteWorkerOptions.java rename to src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/RemoteWorkerOptions.java index 9dee83a..ca6a431 100644 --- a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/RemoteWorkerOptions.java +++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/RemoteWorkerOptions.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.remote; +package com.google.devtools.build.remote.worker; import com.google.devtools.build.lib.actions.LocalHostCapacity; import com.google.devtools.common.options.Converters.RangeConverter;
diff --git a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/StatusUtils.java b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/StatusUtils.java similarity index 97% rename from src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/StatusUtils.java rename to src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/StatusUtils.java index 494ee58..46288e6 100644 --- a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/StatusUtils.java +++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/StatusUtils.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.remote; +package com.google.devtools.build.remote.worker; import com.google.devtools.remoteexecution.v1test.Digest; import com.google.protobuf.Any;
diff --git a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/WatcherServer.java b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/WatcherServer.java similarity index 98% rename from src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/WatcherServer.java rename to src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/WatcherServer.java index 9a242f9..26797dc 100644 --- a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/WatcherServer.java +++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/WatcherServer.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.remote; +package com.google.devtools.build.remote.worker; import com.google.common.base.Throwables; import com.google.common.util.concurrent.ListenableFuture;
diff --git a/src/tools/remote_worker/BUILD b/src/tools/remote_worker/BUILD deleted file mode 100644 index 3a45276..0000000 --- a/src/tools/remote_worker/BUILD +++ /dev/null
@@ -1,16 +0,0 @@ -filegroup( - name = "srcs", - srcs = glob(["**"]) + ["//src/tools/remote_worker/src/main/java/com/google/devtools/build/remote:srcs"], - visibility = ["//src:__pkg__"], -) - -java_binary( - name = "remote_worker", - jvm_flags = [ - # Enables REST for Hazelcast server for testing. - "-Dhazelcast.rest.enabled=true", - ], - main_class = "com.google.devtools.build.remote.RemoteWorker", - visibility = ["//visibility:public"], - runtime_deps = ["//src/tools/remote_worker/src/main/java/com/google/devtools/build/remote"], -)