Repository: hadoop Updated Branches: refs/heads/branch-2.7 cafee1109 -> b60e11e6b
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/b60e11e6 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b60e11e6 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b60e11e6 Branch: refs/heads/branch-2.7 Commit: b60e11e6bf743093d01c263a6c7cc899d26f7e6c Parents: cafee11 Author: Junping Du <[email protected]> Authored: Mon Apr 17 15:51:10 2017 -0700 Committer: Rohith Sharma K S <[email protected]> Committed: Tue May 30 14:19:27 2017 +0530 ---------------------------------------------------------------------- .../apache/hadoop/yarn/server/resourcemanager/AdminService.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b60e11e6/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 de393f2..5248adb 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 @@ -289,6 +289,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]
