Merge two experimental_local_disk_cache options to one

Fixes: bazelbuild#4870. Test Plan: $ bazel test src/test/shell/bazel:local_action_cache_test
davido · Mar 19, 2018 · 8e4a05d · 8e4a05d
1 parent e2df6e2
commit 8e4a05d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 18 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteActionContextProvider.java
@@ -14,7 +14,7 @@
 package com.google.devtools.build.lib.remote;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-
+import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.actions.ActionContext;
 import com.google.devtools.build.lib.actions.ResourceManager;
@@ -60,7 +60,7 @@ public Iterable<? extends ActionContext> getActionContexts() {
     String buildRequestId = env.getBuildRequestId().toString();
     String commandId = env.getCommandId().toString();
 
-    if (remoteOptions.experimentalRemoteSpawnCache || remoteOptions.experimentalLocalDiskCache) {
+    if (remoteOptions.experimentalRemoteSpawnCache || remoteOptions.localDiskCache != null) {
       RemoteSpawnCache spawnCache =
           new RemoteSpawnCache(
               env.getExecRoot(),

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
@@ -190,27 +190,17 @@ public final class RemoteOptions extends OptionsBase {
   )
   public boolean experimentalRemoteSpawnCache;
 
-  // TODO(davido): Find a better place for this and the next option.
+  // TODO(davido): Find a better place for this option.
   @Option(
-    name = "experimental_local_disk_cache",
-    defaultValue = "false",
-    category = "remote",
-    documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
-    effectTags = {OptionEffectTag.UNKNOWN},
-    help = "Whether to use the experimental local disk cache."
-  )
-  public boolean experimentalLocalDiskCache;
-
-  @Option(
-    name = "experimental_local_disk_cache_path",
+    name = "local_disk_cache",
     defaultValue = "null",
     category = "remote",
     documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
     effectTags = {OptionEffectTag.UNKNOWN},
     converter = OptionsUtils.PathFragmentConverter.class,
     help = "A file path to a local disk cache."
   )
-  public PathFragment experimentalLocalDiskCachePath;
+  public PathFragment localDiskCache;
 
   @Option(
     name = "experimental_guard_against_concurrent_changes",

diff --git a/src/main/java/com/google/devtools/build/lib/remote/SimpleBlobStoreFactory.java b/src/main/java/com/google/devtools/build/lib/remote/SimpleBlobStoreFactory.java
@@ -49,7 +49,7 @@ public static SimpleBlobStore createRest(RemoteOptions options, Credentials cred
   public static SimpleBlobStore createLocalDisk(RemoteOptions options, Path workingDirectory)
       throws IOException {
     return new OnDiskBlobStore(
-        workingDirectory.getRelative(checkNotNull(options.experimentalLocalDiskCachePath)));
+        workingDirectory.getRelative(checkNotNull(options.localDiskCache)));
   }
 
   public static SimpleBlobStore create(
@@ -71,7 +71,7 @@ public static boolean isRemoteCacheOptions(RemoteOptions options) {
   }
 
   public static boolean isLocalDiskCache(RemoteOptions options) {
-    return options.experimentalLocalDiskCache;
+    return options.localDiskCache != null;
   }
 
   private static boolean isRestUrlOptions(RemoteOptions options) {

diff --git a/src/test/shell/bazel/local_action_cache_test.sh b/src/test/shell/bazel/local_action_cache_test.sh
@@ -27,7 +27,7 @@ function test_local_action_cache() {
   local execution_file="${TEST_TMPDIR}/run.log"
   local input_file="foo.in"
   local output_file="bazel-genfiles/foo.txt"
-  local flags="--experimental_local_disk_cache_path=$cache --experimental_local_disk_cache"
+  local flags="--local_disk_cache=$cache"
 
   rm -rf $cache
   mkdir $cache