Repository: hadoop Updated Branches: refs/heads/branch-2.9.0 4e1fd7b02 -> e1852f63a
YARN-7453. Fix issue where RM fails to switch to active after first successful start. (Rohith Sharma K S via asuresh) (cherry picked from commit a9c70b0e84dab0c41e480a0dc0cb1a22efdc64ee) (cherry picked from commit 5486542074a7025061a427df968755f53c692477) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e1852f63 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e1852f63 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e1852f63 Branch: refs/heads/branch-2.9.0 Commit: e1852f63addc3a163d9d471a7500cd097ee5b415 Parents: 4e1fd7b Author: Arun Suresh <[email protected]> Authored: Wed Nov 8 08:00:53 2017 -0800 Committer: Arun Suresh <[email protected]> Committed: Wed Nov 8 08:08:53 2017 -0800 ---------------------------------------------------------------------- .../yarn/server/resourcemanager/ResourceManager.java | 12 ++++++------ .../server/resourcemanager/recovery/ZKRMStateStore.java | 5 ++++- .../scheduler/capacity/conf/ZKConfigurationStore.java | 3 ++- 3 files changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e1852f63/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java index 75c20d6..2f46d5e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java @@ -341,7 +341,7 @@ public class ResourceManager extends CompositeService implements Recoverable { conf.getBoolean(YarnConfiguration.CURATOR_LEADER_ELECTOR, YarnConfiguration.DEFAULT_CURATOR_LEADER_ELECTOR_ENABLED); if (curatorEnabled) { - this.zkManager = getAndStartZKManager(conf); + this.zkManager = createAndStartZKManager(conf); elector = new CuratorBasedElectorService(this); } else { elector = new ActiveStandbyElectorBasedElectorService(this); @@ -355,11 +355,8 @@ public class ResourceManager extends CompositeService implements Recoverable { * @return ZooKeeper Curator manager. * @throws IOException If it cannot create the manager. */ - public synchronized ZKCuratorManager getAndStartZKManager(Configuration + public ZKCuratorManager createAndStartZKManager(Configuration config) throws IOException { - if (this.zkManager != null) { - return zkManager; - } ZKCuratorManager manager = new ZKCuratorManager(config); // Get authentication @@ -379,7 +376,10 @@ public class ResourceManager extends CompositeService implements Recoverable { } manager.start(authInfos); - this.zkManager = manager; + return manager; + } + + public ZKCuratorManager getZKManager() { return zkManager; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/e1852f63/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java ---------------------------------------------------------------------- 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 c4c482a..f9dbb6f 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 @@ -358,7 +358,10 @@ public class ZKRMStateStore extends RMStateStore { amrmTokenSecretManagerRoot = getNodePath(zkRootNodePath, AMRMTOKEN_SECRET_MANAGER_ROOT); reservationRoot = getNodePath(zkRootNodePath, RESERVATION_SYSTEM_ROOT); - zkManager = resourceManager.getAndStartZKManager(conf); + zkManager = resourceManager.getZKManager(); + if(zkManager==null) { + zkManager = resourceManager.createAndStartZKManager(conf); + } delegationTokenNodeSplitIndex = conf.getInt(YarnConfiguration.ZK_DELEGATION_TOKEN_NODE_SPLIT_INDEX, YarnConfiguration.DEFAULT_ZK_DELEGATION_TOKEN_NODE_SPLIT_INDEX); http://git-wip-us.apache.org/repos/asf/hadoop/blob/e1852f63/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/ZKConfigurationStore.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/ZKConfigurationStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/ZKConfigurationStore.java index a0bba8c..497ebfe 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/ZKConfigurationStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/ZKConfigurationStore.java @@ -81,7 +81,8 @@ public class ZKConfigurationStore extends YarnConfigurationStore { this.znodeParentPath = conf.get(YarnConfiguration.RM_SCHEDCONF_STORE_ZK_PARENT_PATH, YarnConfiguration.DEFAULT_RM_SCHEDCONF_STORE_ZK_PARENT_PATH); - this.zkManager = rmContext.getResourceManager().getAndStartZKManager(conf); + this.zkManager = + rmContext.getResourceManager().createAndStartZKManager(conf); this.zkAcl = ZKCuratorManager.getZKAcls(conf); this.zkVersionPath = getNodePath(znodeParentPath, ZK_VERSION_PATH); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
