aboutsummaryrefslogtreecommitdiffstats
path: root/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2020-12-15 11:05:35 +0100
committerMartin Polden <mpolden@mpolden.no>2020-12-15 11:23:14 +0100
commit1468a9df93196f38d8fc86d5d2be61650a94980f (patch)
treeaef1b0425009570e62afdf3f5076da0766b4d194 /zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java
parentb012824fe389d2a6cbfc054d42ce24d7ec76490b (diff)
Shut down ZooKeeper properly
Diffstat (limited to 'zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java')
-rw-r--r--zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java
index 71ac4bbf62f..c64bfd783e0 100644
--- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java
+++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java
@@ -42,8 +42,8 @@ public class ZooKeeperRunner implements Runnable {
void shutdown() {
log.log(Level.INFO, "Triggering shutdown");
+ server.shutdown();
executorService.shutdownNow();
- log.log(Level.INFO, "Shutdown triggered");
try {
if (!executorService.awaitTermination(shutdownTimeout.toMillis(), TimeUnit.MILLISECONDS)) {
log.log(Level.WARNING, "Failed to shut down within " + shutdownTimeout);