From f454c77caea83aa8dd16e5a540493fca9cb6d014 Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Wed, 12 Dec 2018 11:35:12 +0100 Subject: Re-enable caching in cd-us-central-1 --- .../java/com/yahoo/vespa/hosted/provision/NodeRepository.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'node-repository') diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java index 852d47a4882..8710b47b914 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java @@ -98,7 +98,7 @@ public class NodeRepository extends AbstractComponent { */ public NodeRepository(NodeFlavors flavors, Curator curator, Clock clock, Zone zone, NameResolver nameResolver, DockerImage dockerImage, boolean useCuratorClientCache) { - this.db = new CuratorDatabaseClient(flavors, curator, clock, zone, useCacheIn(zone, useCuratorClientCache)); + this.db = new CuratorDatabaseClient(flavors, curator, clock, zone, useCuratorClientCache); this.zone = zone; this.clock = clock; this.flavors = flavors; @@ -112,14 +112,6 @@ public class NodeRepository extends AbstractComponent { db.writeTo(state, db.getNodes(state), Agent.system, Optional.empty()); } - private static boolean useCacheIn(Zone zone, boolean useCache) { - if (zone.region().value().equals("cd-us-central-1")) { - // TODO: Temporarily disabled in CD to see if allocation conflict is related to caching - return false; - } - return useCache; - } - /** Returns the curator database client used by this */ public CuratorDatabaseClient database() { return db; } -- cgit v1.2.3