diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-09-04 20:12:34 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-09-04 20:12:34 +0200 |
commit | 906ec54ebd5c9d60fa04259a76dd7d92d6058bf0 (patch) | |
tree | 1fdbd150eccd4fe09bfa6916ffd9bce39ee4e916 /config-model/src/main | |
parent | e0dc287f3ee28e59310f964ef31c76c92f7c7ec5 (diff) |
Don't limit zk connections on non-hosted system.
It doesn't work with factorys multitenant && !hosted mode.
Diffstat (limited to 'config-model/src/main')
-rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java | 3 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java | 12 |
2 files changed, 4 insertions, 11 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java index 8ca82692e98..3f229835914 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java @@ -84,7 +84,8 @@ public class DeployState implements ConfigDefinitionStore { private DeployState(ApplicationPackage applicationPackage, SearchDocumentModel searchDocumentModel, RankProfileRegistry rankProfileRegistry, FileRegistry fileRegistry, DeployLogger deployLogger, Optional<HostProvisioner> hostProvisioner, DeployProperties properties, Optional<ApplicationPackage> permanentApplicationPackage, Optional<ConfigDefinitionRepo> configDefinitionRepo, - java.util.Optional<Model> previousModel, Set<Rotation> rotations, Zone zone, QueryProfiles queryProfiles, SemanticRules semanticRules, Instant now) { + java.util.Optional<Model> previousModel, Set<Rotation> rotations, Zone zone, QueryProfiles queryProfiles, + SemanticRules semanticRules, Instant now) { this.logger = deployLogger; this.fileRegistry = fileRegistry; this.rankProfileRegistry = rankProfileRegistry; diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java b/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java index 1a145e6c83e..6a5abee7cb3 100644 --- a/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java +++ b/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java @@ -36,7 +36,8 @@ public class Hosts { hostsBuilder.put(host.hostname(), host); this.hosts = hostsBuilder.build(); - System.setProperty("zookeeper.vespa.clients", toHostnameString(hosts)); // See com.yahoo.vespa.zookeeper.ZooKeeperServer + // Don't limit zk connections on non-hosted systems + System.setProperty("zookeeper.vespa.clients", ""); } /** Throw IllegalArgumentException if host aliases breaks invariants */ @@ -55,15 +56,6 @@ public class Hosts { } } - private String toHostnameString(Collection<Host> hosts) { - StringBuilder b = new StringBuilder(); - for (Host host : hosts) - b.append(host.hostname()).append(","); - if (b.length() > 0) - b.setLength(b.length() - 1); // remove last comma - return b.toString(); - } - /** * Builds host system from a hosts.xml file * |