Allow disabling the simple blob caches via CLI flag overrides.

jmillikin-stripe · Copybara-Service · commit 6b1635279e8b · 2018-06-07T04:18:18.000-07:00
This fixes a regression from v0.13. When the local disk cache flags were unified into `--disk_cache`, it became impossible to override a default cache location such that the cache became disabled. This prevents canarying of remote execution in the presence of a default bazelrc that enables the disk cache. Fixes bazelbuild#5308 Closes bazelbuild#5338. PiperOrigin-RevId: 199613922
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
@@ -75,7 +75,7 @@ public static boolean isRemoteCacheOptions(RemoteOptions options) {
   }
 
   public static boolean isDiskCache(RemoteOptions options) {
-    return options.diskCache != null;
+    return options.diskCache != null && !options.diskCache.isEmpty();
   }
 
   static boolean isRestUrlOptions(RemoteOptions options) {

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public static boolean isRemoteCacheOptions(RemoteOptions options) {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`public static boolean isDiskCache(RemoteOptions options) {`
`78`		`- return options.diskCache != null;`
	`78`	`+ return options.diskCache != null && !options.diskCache.isEmpty();`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`static boolean isRestUrlOptions(RemoteOptions options) {`