diff options
author | Martin Polden <mpolden@mpolden.no> | 2020-12-15 16:57:48 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2020-12-15 16:57:48 +0100 |
commit | 5b34a6e666b189f4fef6c482fac7a68ea5756ee0 (patch) | |
tree | c679544e9cb48beb87e9dbfcfcb34bfd23026b86 /zookeeper-server/zookeeper-server-3.6.2 | |
parent | 0dd69b57d88cf06ffb832ea735ae5773df437792 (diff) |
Wait for quorum peer thread on shutdown
Diffstat (limited to 'zookeeper-server/zookeeper-server-3.6.2')
-rw-r--r-- | zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java b/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java index 2eff37a1b4c..86325f587eb 100644 --- a/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java +++ b/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java @@ -25,7 +25,8 @@ class VespaQuorumPeer extends QuorumPeerMain { if (quorumPeer != null) { try { quorumPeer.shutdown(); - } catch (RuntimeException e) { + quorumPeer.join(); // Wait for shutdown to complete + } catch (RuntimeException|InterruptedException e) { // If shutdown fails, we have no other option than forcing the JVM to stop and letting it be restarted. // // When a VespaZooKeeperServer component receives a new config, the container will try to start a new |