From a6442d127d3bd311542842cdee2ee6dbba7b3629 Mon Sep 17 00:00:00 2001 From: Håkon Hallingstad Date: Thu, 11 Jan 2018 23:11:56 +0100 Subject: Some Curator clients require ensemble connect string --- .../src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java | 2 +- .../vespa/hosted/provision/maintenance/ZooKeeperAccessMaintainer.java | 2 +- .../com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java | 2 +- .../java/com/yahoo/vespa/hosted/provision/NodeRepositoryTester.java | 2 +- .../hosted/provision/maintenance/ZooKeeperAccessMaintainerTest.java | 2 +- .../yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java | 3 +-- 6 files changed, 6 insertions(+), 7 deletions(-) (limited to 'node-repository/src') 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 9b05478eb07..19894050ff4 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 @@ -630,7 +630,7 @@ public class NodeRepository extends AbstractComponent { // Public for testing public List getConfigNodes() { // TODO: Revisit this when config servers are added to the repository - return Arrays.stream(curator.connectionSpec().split(",")) + return Arrays.stream(curator.zooKeeperEnsembleConnectionSpec().split(",")) .map(hostPort -> hostPort.split(":")[0]) .map(host -> createNode(host, host, Optional.empty(), flavors.getFlavorOrThrow("v-4-8-100"), // Must be a flavor that exists in Hosted Vespa diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ZooKeeperAccessMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ZooKeeperAccessMaintainer.java index 18987ccc97e..b392d670a77 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ZooKeeperAccessMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ZooKeeperAccessMaintainer.java @@ -39,7 +39,7 @@ public class ZooKeeperAccessMaintainer extends Maintainer { hosts.add(node.hostname()); if ( ! hosts.isEmpty()) { // no nodes -> not a hosted instance: Pass an empty list to deactivate restriction - for (String hostPort : curator.connectionSpec().split(",")) + for (String hostPort : curator.zooKeeperEnsembleConnectionSpec().split(",")) hosts.add(hostPort.split(":")[0]); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java index 928d8082c6b..4596b71300a 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java @@ -51,7 +51,7 @@ public class MockNodeRepository extends NodeRepository { new DockerImage("docker-registry.domain.tld:8080/dist/vespa")); this.flavors = flavors; - curator.setConnectionSpec("cfg1:1234,cfg2:1234,cfg3:1234"); + curator.setZooKeeperEnsembleConnectionSpec("cfg1:1234,cfg2:1234,cfg3:1234"); populate(); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTester.java index 3d01bde4291..583d5658ef4 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTester.java @@ -32,7 +32,7 @@ public class NodeRepositoryTester { nodeFlavors = new NodeFlavors(createConfig()); clock = new ManualClock(); curator = new MockCurator(); - curator.setConnectionSpec("server1:1234,server2:5678"); + curator.setZooKeeperEnsembleConnectionSpec("server1:1234,server2:5678"); nodeRepository = new NodeRepository(nodeFlavors, curator, clock, Zone.defaultZone(), new MockNameResolver().mockAnyLookup(), new DockerImage("docker-registry.domain.tld:8080/dist/vespa")); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ZooKeeperAccessMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ZooKeeperAccessMaintainerTest.java index bba5aa2db8d..93cf19f5450 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ZooKeeperAccessMaintainerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ZooKeeperAccessMaintainerTest.java @@ -23,7 +23,7 @@ public class ZooKeeperAccessMaintainerTest { @Test public void test() { NodeRepositoryTester tester = new NodeRepositoryTester(); - tester.curator().setConnectionSpec("server1:1234,server2:5678"); + tester.curator().setZooKeeperEnsembleConnectionSpec("server1:1234,server2:5678"); ZooKeeperAccessMaintainer maintainer = new ZooKeeperAccessMaintainer(tester.nodeRepository(), tester.curator(), Duration.ofHours(1), new JobControl(tester.nodeRepository().database())); assertTrue(ZooKeeperServer.getAllowedClientHostnames().isEmpty()); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java index c38d6f6bd40..492bcaa5462 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java @@ -18,7 +18,6 @@ import org.junit.Test; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.Comparator; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -230,7 +229,7 @@ public class AclProvisioningTest { } private List setConfigServers(String connectionSpec) { - curator.setConnectionSpec(connectionSpec); + curator.setZooKeeperEnsembleConnectionSpec(connectionSpec); return tester.nodeRepository().getConfigNodes(); } -- cgit v1.2.3