hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aajis...@apache.org
Subject hadoop git commit: YARN-4938. MiniYarnCluster should not request transitionToActive to RM on non-HA environment. Contributed by Eric Badger.
Date Sun, 10 Apr 2016 16:36:50 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 17c4f34b3 -> 88556294e


YARN-4938. MiniYarnCluster should not request transitionToActive to RM on non-HA environment.
Contributed by Eric Badger.

(cherry picked from commit 1b78b2ba17cffdd19ae056555dd7f89b7a3eb06a)


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

Branch: refs/heads/branch-2
Commit: 88556294e20f118ecd8295f492b9617da413c83d
Parents: 17c4f34
Author: Akira Ajisaka <aajisaka@apache.org>
Authored: Mon Apr 11 01:31:49 2016 +0900
Committer: Akira Ajisaka <aajisaka@apache.org>
Committed: Mon Apr 11 01:32:49 2016 +0900

----------------------------------------------------------------------
 .../test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/88556294/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
index c933736..2704129 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
@@ -462,7 +462,7 @@ public class MiniYARNCluster extends CompositeService {
     @Override
     protected synchronized void serviceStart() throws Exception {
       startResourceManager(index);
-      if(index == 0) {
+      if(index == 0 && resourceManagers[index].getRMContext().isHAEnabled()) {
         resourceManagers[index].getRMContext().getRMAdminService()
           .transitionToActive(new HAServiceProtocol.StateChangeRequestInfo(
             HAServiceProtocol.RequestSource.REQUEST_BY_USER_FORCED));


Mime
View raw message