Disable local fallback by default
We don't want people to get used to this.
PiperOrigin-RevId: 158508816
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 d779aa7..35dd9f5 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
@@ -89,7 +89,7 @@
@Option(
name = "remote_local_fallback",
- defaultValue = "true",
+ defaultValue = "false",
category = "remote",
help = "Whether to fall back to standalone local execution strategy if remote execution fails."
)
diff --git a/src/test/shell/bazel/remote_execution_test.sh b/src/test/shell/bazel/remote_execution_test.sh
index d7b302a..6dfd0ae 100755
--- a/src/test/shell/bazel/remote_execution_test.sh
+++ b/src/test/shell/bazel/remote_execution_test.sh
@@ -78,7 +78,6 @@
bazel clean --expunge >& $TEST_log
bazel --host_jvm_args=-Dbazel.DigestFunction=SHA1 build \
--spawn_strategy=remote \
- --noremote_local_fallback \
--remote_executor=localhost:${worker_port} \
--remote_cache=localhost:${worker_port} \
//a:test >& $TEST_log \
@@ -102,7 +101,6 @@
EOF
bazel --host_jvm_args=-Dbazel.DigestFunction=SHA1 test \
--spawn_strategy=remote \
- --noremote_local_fallback \
--remote_executor=localhost:${worker_port} \
--remote_cache=localhost:${worker_port} \
--test_output=errors \
@@ -152,7 +150,6 @@
EOF
bazel --host_jvm_args=-Dbazel.DigestFunction=SHA1 test \
--spawn_strategy=remote \
- --noremote_local_fallback \
--remote_executor=localhost:${worker_port} \
--remote_cache=localhost:${worker_port} \
--test_output=errors \
@@ -185,7 +182,6 @@
bazel clean --expunge >& $TEST_log
bazel --host_jvm_args=-Dbazel.DigestFunction=SHA1 build \
--spawn_strategy=remote \
- --noremote_local_fallback \
--remote_executor=localhost:${worker_port} \
--remote_cache=localhost:${worker_port} \
//a:large_output >& $TEST_log \
@@ -214,7 +210,6 @@
bazel clean --expunge >& $TEST_log
bazel --host_jvm_args=-Dbazel.DigestFunction=SHA1 build \
--spawn_strategy=remote \
- --noremote_local_fallback \
--remote_rest_cache=http://localhost:${hazelcast_port}/hazelcast/rest/maps/cache \
//a:test >& $TEST_log \
|| fail "Failed to build //a:test with remote gRPC cache service"
@@ -238,7 +233,6 @@
EOF
bazel --host_jvm_args=-Dbazel.DigestFunction=SHA1 test \
--spawn_strategy=remote \
- --noremote_local_fallback \
--remote_executor=localhost:${worker_port} \
--remote_cache=localhost:${worker_port} \
--test_output=errors \
@@ -272,7 +266,6 @@
EOF
bazel --host_jvm_args=-Dbazel.DigestFunction=SHA1 test \
--spawn_strategy=remote \
- --noremote_local_fallback \
--remote_executor=localhost:${worker_port} \
--remote_cache=localhost:${worker_port} \
--test_output=errors \
@@ -310,7 +303,6 @@
EOF
bazel --host_jvm_args=-Dbazel.DigestFunction=SHA1 test \
--spawn_strategy=remote \
- --noremote_local_fallback \
--remote_executor=localhost:${worker_port} \
--remote_cache=localhost:${worker_port} \
--test_output=errors \