diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2022-01-11 16:19:05 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2022-01-11 16:19:05 +0100 |
| commit | 1644ce9ddf6d416375ae488036626f59d15c95d8 (patch) | |
| tree | f67e2421a1d0f7b9beb72e33082d2e3c3475e939 /zookeeper-server/zookeeper-server-common | |
| parent | 2e2267852b8d71128dec30e0c344e42518add195 (diff) | |
Unit test
Diffstat (limited to 'zookeeper-server/zookeeper-server-common')
2 files changed, 1 insertions, 4 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 c65035106f1..5157dd5d59c 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 @@ -130,7 +130,7 @@ public class Configurator { .append("observer"); } sb.append(";") - .append(clientPort); + .append(server.clientPort()); return sb.toString(); } 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 77811dd6bee..604419c063d 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 @@ -86,10 +86,7 @@ public class Reconfigurer extends AbstractComponent { // TODO jonmv: read dynamic file, discard if old quorum impossible (config file + .dynamic.<id>) // TODO jonmv: if dynamic file, all unlisted servers are observers; otherwise joiners are observers - // TODO jonmv: verify reconfig by issuing a dummy write // TODO jonmv: wrap Curator in Provider, for Curator shutdown - // TODO jonmv: scale down to 1 server as well - // TODO jonmv: unit test this private void reconfigure(ZookeeperServerConfig newConfig) { Instant reconfigTriggered = Instant.now(); String newServers = String.join(",", servers(newConfig)); |