diff options
| author | Martin Polden <mpolden@mpolden.no> | 2020-12-16 11:37:36 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2020-12-16 11:51:10 +0100 |
| commit | 0245386a40ab33fa2c3891d2ba2c0f126244006f (patch) | |
| tree | a7bb87c79adb5a33e18b62792bd4d1f95ba56a3b /zookeeper-server/zookeeper-server-3.6.2 | |
| parent | e5b1ddb28a720200aacb31de95e331068cf33c01 (diff) | |
Always force shutdown of non-reconfigurable ZooKeeper server
This basically reverts to the original behaviour, where the container is forced
to exit when a new VespaZooKeeperServer component is setup.
Diffstat (limited to 'zookeeper-server/zookeeper-server-3.6.2')
2 files changed, 10 insertions, 0 deletions
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 f8ca8987a70..d614aecbad2 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 @@ -31,4 +31,9 @@ public class ReconfigurableVespaZooKeeperServer extends AbstractComponent implem peer.start(configFilePath); } + @Override + public boolean reconfigurable() { + return true; + } + } diff --git a/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java b/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java index e93bae1e438..2a66bebe048 100644 --- a/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java +++ b/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java @@ -38,4 +38,9 @@ public class VespaZooKeeperServerImpl extends AbstractComponent implements Vespa peer.start(configFilePath); } + @Override + public boolean reconfigurable() { + return false; + } + } |