Repository: hadoop Updated Branches: refs/heads/branch-2 6f5912c10 -> 9289f4527
YARN-6304. Skip rm.transitionToActive call to RM if RM is already active. Contributed by Rohith Sharma K S. (cherry picked from commit 6ed9d362242d36bfae4083bf3b1c2eb32fbb2f72) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9289f452 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9289f452 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9289f452 Branch: refs/heads/branch-2 Commit: 9289f4527d8fc3418fdeb8bf213b0f62525092d5 Parents: 6f5912c Author: Junping Du <[email protected]> Authored: Mon Apr 17 15:51:10 2017 -0700 Committer: Junping Du <[email protected]> Committed: Mon Apr 17 15:52:02 2017 -0700 ---------------------------------------------------------------------- .../apache/hadoop/yarn/server/resourcemanager/AdminService.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9289f452/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.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/AdminService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java index bcf7309..74c87a2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java @@ -286,6 +286,9 @@ public class AdminService extends CompositeService implements @Override public synchronized void transitionToActive( HAServiceProtocol.StateChangeRequestInfo reqInfo) throws IOException { + if (isRMActive()) { + return; + } // call refreshAdminAcls before HA state transition // for the case that adminAcls have been updated in previous active RM try { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
