diff options
| author |  John Millikin <jmillikin@stripe.com> | 2018-06-07 04:16:50 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-07 04:18:18 -0700 |
| commit | 6b1635279e8b33dc1ac505ac81825e38f8797a14 (patch) | |
| tree | 075daf967a3f1d4de2dc4ddd6f3b73248e7b9287 | |
| parent | 708b957f7c37fd83410588d8ef3792135abd4d8d (diff) | |
Allow disabling the simple blob caches via CLI flag overrides.
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 #5308
Closes #5338.
PiperOrigin-RevId: 199613922
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/remote/SimpleBlobStoreFactory.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 index 7d893fbd4a..47a14bffdd 100644 --- 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 final class SimpleBlobStoreFactory { } public static boolean isDiskCache(RemoteOptions options) { - return options.diskCache != null; + return options.diskCache != null && !options.diskCache.isEmpty(); } static boolean isRestUrlOptions(RemoteOptions options) { |