diff options
2 files changed, 3 insertions, 3 deletions
diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java index 7d35530a2bb..8f8058c6c0b 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java @@ -89,7 +89,7 @@ public class Configurator { sb.append("reconfigEnabled=true").append("\n"); sb.append("skipACL=yes").append("\n"); ensureThisServerIsRepresented(config.myid(), config.server()); - config.server().forEach(server -> sb.append(serverSpec(server, config.clientPort(), server.joining())).append("\n")); + config.server().forEach(server -> sb.append(serverSpec(server, server.joining())).append("\n")); sb.append(new TlsQuorumConfig().createConfig(vespaTlsConfig)); sb.append(new TlsClientServerConfig().createConfig(vespaTlsConfig)); return sb.toString(); @@ -114,7 +114,7 @@ public class Configurator { } } - static String serverSpec(ZookeeperServerConfig.Server server, int clientPort, boolean joining) { + static String serverSpec(ZookeeperServerConfig.Server server, boolean joining) { StringBuilder sb = new StringBuilder(); sb.append("server.") .append(server.id()) diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java index 389df340ca7..46b7f8fa0ca 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java @@ -141,7 +141,7 @@ public class Reconfigurer extends AbstractComponent { private static List<String> servers(ZookeeperServerConfig config) { return config.server().stream() .filter(server -> ! server.retired()) - .map(server -> serverSpec(server, config.clientPort(), false)) + .map(server -> serverSpec(server, false)) .collect(toList()); } |