diff options
| author | Martin Polden <mpolden@mpolden.no> | 2020-12-15 15:24:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-15 15:24:16 +0100 |
| commit | d628ca1587f85009ff64cea5ed4a998824966d9a (patch) | |
| tree | 5422db39fb3f697dd6cbcd38a6d5007a64e702ae | |
| parent | fb16493fce731d1af3f98ebf599a43a79c152df7 (diff) | |
| parent | 20cd60e994f30c3a3182f2f6f03a097ac41a8e71 (diff) | |
Merge pull request #15825 from vespa-engine/mpolden/set-peer-first
Ensure that peer is set before calling start
2 files changed, 2 insertions, 2 deletions
diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java index 316bf389023..f8ca8987a70 100644 --- a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java +++ b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java @@ -18,8 +18,8 @@ public class ReconfigurableVespaZooKeeperServer extends AbstractComponent implem @Inject public ReconfigurableVespaZooKeeperServer(Reconfigurer reconfigurer, ZookeeperServerConfig zookeeperServerConfig) { + this.peer = new VespaQuorumPeer(); reconfigurer.startOrReconfigure(zookeeperServerConfig, this); - peer = new VespaQuorumPeer(); } @Override diff --git a/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java b/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java index 316bf389023..f8ca8987a70 100644 --- a/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java +++ b/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java @@ -18,8 +18,8 @@ public class ReconfigurableVespaZooKeeperServer extends AbstractComponent implem @Inject public ReconfigurableVespaZooKeeperServer(Reconfigurer reconfigurer, ZookeeperServerConfig zookeeperServerConfig) { + this.peer = new VespaQuorumPeer(); reconfigurer.startOrReconfigure(zookeeperServerConfig, this); - peer = new VespaQuorumPeer(); } @Override |