[incubator-pulsar] branch branch-2.1 updated: Handle /managed-ledgers znode existance on cluster init (#2379) (#2510)

[si...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sijie pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git


The following commit(s) were added to refs/heads/branch-2.1 by this push:
     new bf4a50b  Handle /managed-ledgers znode existance on cluster init (#2379) (#2510)
bf4a50b is described below

commit bf4a50b45dcaec7bd48b38a739bc4e7d43d36af1
Author: Ivan Kelly <iv...@apache.org>
AuthorDate: Tue Sep 4 23:41:47 2018 +0200

    Handle /managed-ledgers znode existance on cluster init (#2379) (#2510)
    
    ManagedLedger clients may create the /managed-ledger znode on boot, so
    if a broker starts before the metadata is initialized, it could
    potentially block initialization.
    
    This patch changes this by making the existance of /managed-ledger a
    non-error condition.
---
 .../main/java/org/apache/pulsar/PulsarClusterMetadataSetup.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarClusterMetadataSetup.java b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarClusterMetadataSetup.java
index e35daef..9dd065a 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarClusterMetadataSetup.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarClusterMetadataSetup.java
@@ -147,7 +147,12 @@ public class PulsarClusterMetadataSetup {
             }
         }
 
-        localZk.create("/managed-ledgers", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+        try {
+            localZk.create("/managed-ledgers", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+        } catch (NodeExistsException e) {
+            // Ignore
+        }
+
         localZk.create("/namespace", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
 
         try {