Shutdown and wait for termination

1 files changed, 10 insertions, 1 deletions

diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java
index 8fcaf6210a0..f66f72b15e3 100644
--- a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java
+++ b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java
@@ -11,6 +11,7 @@ import org.apache.zookeeper.server.quorum.QuorumPeerMain;
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -36,7 +37,15 @@ public class ZooKeeperRunner implements Runnable {
     }
 
     void shutdown() {
-        executorService.shutdownNow();
+        executorService.shutdown();
+        try {
+            executorService.awaitTermination(10000, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            log.log(Level.INFO, "Interrupted waiting for executor to complete", e);
+        }
+        if ( ! executorService.isTerminated()) {
+            executorService.shutdownNow();
+        }
     }
 
     @Override