commit 1ac4f93a1db76b1edbfde809cc0e39ca91a17c59
author sjyang18 <41694933+sjyang18@users.noreply.github.com> Mon Jan 25 18:05:47 2021 -0800
committer GitHub <noreply@github.com> Mon Jan 25 21:05:47 2021 -0500
tree f0ee2db009db2dc1298564ff5286d0effa0f9a2b
parent 680886a61158fe0906424f9fe43c2916f1f9f48f

Fix Accumulo-init hanging when TLS enabled on Zookeeper (#1883)

server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java

diff --git a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
index dc6c263..4d7a169 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
@@ -77,6 +77,8 @@
 import org.apache.accumulo.core.replication.ReplicationSchema.StatusSection;
 import org.apache.accumulo.core.replication.ReplicationSchema.WorkSection;
 import org.apache.accumulo.core.replication.ReplicationTable;
+import org.apache.accumulo.core.singletons.SingletonManager;
+import org.apache.accumulo.core.singletons.SingletonManager.Mode;
 import org.apache.accumulo.core.spi.compaction.SimpleCompactionDispatcher;
 import org.apache.accumulo.core.spi.crypto.CryptoService;
 import org.apache.accumulo.core.util.ColumnFQ;
@@ -988,6 +990,8 @@
     } catch (Exception e) {
       log.error("Fatal exception", e);
       throw new RuntimeException(e);
+    } finally {
+      SingletonManager.setMode(Mode.CLOSED);
     }
   }