diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java index 70ccd8c..6b2bd5c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java @@ -31,8 +31,6 @@ import java.util.List; import com.google.common.base.Preconditions; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; @@ -305,10 +303,10 @@ public synchronized void startInternal() throws Exception { createRootDir(zkRootNodePath); setRootNodeAcls(); deleteFencingNodePath(); - if (HAUtil.isHAEnabled(getConfig())){ - verifyActiveStatusThread = new VerifyActiveStatusThread(); - verifyActiveStatusThread.start(); - } + + verifyActiveStatusThread = new VerifyActiveStatusThread(); + verifyActiveStatusThread.start(); + createRootDir(rmAppRoot); createRootDir(rmDTSecretManagerRoot); createRootDir(dtMasterKeysRootPath); @@ -405,11 +403,10 @@ private synchronized void closeZkClients() throws IOException { } @Override - protected synchronized void closeInternal() throws Exception { - if (verifyActiveStatusThread != null) { - verifyActiveStatusThread.interrupt(); - verifyActiveStatusThread.join(1000); - } + protected void closeInternal() throws Exception { + verifyActiveStatusThread.interrupt(); + verifyActiveStatusThread.join(1000); + closeZkClients(); }