diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java b/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 dcf891a48d2..2ebb56402e0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java @@ -453,7 +453,7 @@ protected synchronized void closeInternal() throws Exception { verifyActiveStatusThread.join(1000); } - if (!HAUtil.isHAEnabled(getConfig())) { + if (zkManager != resourceManager.getZKManager()) { CuratorFramework curatorFramework = zkManager.getCurator(); IOUtils.closeStream(curatorFramework); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStore.java index f21ff962097..6b6f0131cd6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStore.java @@ -453,6 +453,7 @@ public void testZKRootPathAcls() throws Exception { rm = new MockRM(conf); rm.start(); rm.getRMContext().getRMAdminService().transitionToActive(req); + stateStore = (ZKRMStateStore) rm.getRMContext().getStateStore(); acls = stateStore.getACL(rootPath); assertEquals(acls.size(), 1); verifyZKACL("world", "anyone", Perms.ALL, acls); @@ -463,6 +464,7 @@ public void testZKRootPathAcls() throws Exception { rm = new MockRM(conf); rm.start(); rm.getRMContext().getRMAdminService().transitionToActive(req); + stateStore = (ZKRMStateStore) rm.getRMContext().getStateStore(); acls = stateStore.getACL(rootPath); assertThat(acls).hasSize(2); verifyZKACL("digest", "localhost", Perms.CREATE | Perms.DELETE, acls);