hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From junping...@apache.org
Subject hadoop git commit: YARN-6304. Skip rm.transitionToActive call to RM if RM is already active. Contributed by Rohith Sharma K S.
Date Mon, 17 Apr 2017 22:57:30 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8.1 311d92439 -> 562af708c


YARN-6304. Skip rm.transitionToActive call to RM if RM is already active. Contributed by Rohith
Sharma K S.

(cherry picked from commit 6ed9d362242d36bfae4083bf3b1c2eb32fbb2f72)
(cherry picked from commit 9289f4527d8fc3418fdeb8bf213b0f62525092d5)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/562af708
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/562af708
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/562af708

Branch: refs/heads/branch-2.8.1
Commit: 562af708ca596e8c106905ff3e0a5921991e808b
Parents: 311d924
Author: Junping Du <junping_du@apache.org>
Authored: Mon Apr 17 15:51:10 2017 -0700
Committer: Junping Du <junping_du@apache.org>
Committed: Mon Apr 17 15:59:32 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/562af708/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 5371a21..74be9cd 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
@@ -288,6 +288,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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message