Wait for ZK client to shutdown before returning from close

sijie · Feb 6, 2024 · e41d672 · e41d672
1 parent 7710880
commit e41d672
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/zk/ZKMetadataDriverBase.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/zk/ZKMetadataDriverBase.java
@@ -64,6 +64,7 @@
 public class ZKMetadataDriverBase implements AutoCloseable {
 
     protected static final String SCHEME = "zk";
+    private static final int ZK_CLIENT_WAIT_FOR_SHUTDOWN_TIMEOUT_MS = 5000;
 
     public static String getZKServersFromServiceUri(URI uri) {
         String authority = uri.getAuthority();
@@ -341,7 +342,7 @@ public void close() {
         }
         if (ownZKHandle && null != zk) {
             try {
-                zk.close();
+                zk.close(ZK_CLIENT_WAIT_FOR_SHUTDOWN_TIMEOUT_MS);
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
                 log.warn("Interrupted on closing zookeeper client", e);