diff options
| author |  Marcin Maliszkiewicz <marcinmal@gmail.com> | 2017-01-20 14:31:47 +0000 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-01-20 15:44:47 +0000 |
| commit | 71a22b1b364ae8c8dd74b57170cf8fc4888a089c (patch) | |
| tree | bc3e29228c7acdb83dbe0b76beefa84ad66731b6 /src/main | |
| parent | 726ca5af9d7b40ecf7042f1746c3c7a7dea42cbd (diff) | |
Make --hazelcast_node and --remote_cache options mutually exclusive
Specifying both options can cause OOM on OSX.
--
Change-Id: I52daf194a8840f9e63f1d537f13152e53f8436a7
Reviewed-on: https://cr.bazel.build/8220
PiperOrigin-RevId: 145079331
MOS_MIGRATED_REVID=145079331
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java index c7bbdda939..15ed8ff0bc 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java +++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java @@ -175,8 +175,7 @@ final class RemoteSpawnStrategy implements SpawnActionContext { try { if (ConcurrentMapFactory.isRemoteCacheOptions(options)) { actionCache = new ConcurrentMapActionCache(ConcurrentMapFactory.create(options)); - } - if (GrpcActionCache.isRemoteCacheOptions(options)) { + } else if (GrpcActionCache.isRemoteCacheOptions(options)) { actionCache = new GrpcActionCache(options); } // Otherwise actionCache remains null and remote caching/execution are disabled. |