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 51bb74d..d260b4a 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 @@ -262,11 +262,8 @@ public synchronized void startInternal() throws Exception { create(zkRootNodePath); setRootNodeAcls(); delete(fencingNodePath); - if (HAUtil.isHAEnabled(getConfig()) && !HAUtil - .isAutomaticFailoverEnabled(getConfig())) { - verifyActiveStatusThread = new VerifyActiveStatusThread(); - verifyActiveStatusThread.start(); - } + verifyActiveStatusThread = new VerifyActiveStatusThread(); + verifyActiveStatusThread.start(); create(rmAppRoot); create(rmDTSecretManagerRoot); create(dtMasterKeysRootPath); @@ -308,11 +305,9 @@ private void setRootNodeAcls() throws Exception { } @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); if (!HAUtil.isHAEnabled(getConfig())) { IOUtils.closeStream(curatorFramework);