You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by vi...@apache.org on 2017/04/21 21:35:47 UTC
[03/37] hadoop git commit: YARN-6304. Skip rm.transitionToActive call
to RM if RM is already active. Contributed by Rohith Sharma K S.
YARN-6304. Skip rm.transitionToActive call to RM if RM is already active. Contributed by Rohith Sharma K S.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6ed9d362
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6ed9d362
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6ed9d362
Branch: refs/heads/HDFS-9806
Commit: 6ed9d362242d36bfae4083bf3b1c2eb32fbb2f72
Parents: f1de2c8
Author: Junping Du <ju...@apache.org>
Authored: Mon Apr 17 15:51:10 2017 -0700
Committer: Junping Du <ju...@apache.org>
Committed: Mon Apr 17 15:51:10 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/6ed9d362/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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org