Repository: hadoop Updated Branches: refs/heads/branch-2.8 3de0ff030 -> 35fd4d412
YARN-4938. MiniYarnCluster should not request transitionToActive to RM on non-HA environment. Contributed by Eric Badger. (cherry picked from commit 1b78b2ba17cffdd19ae056555dd7f89b7a3eb06a) (cherry picked from commit 88556294e20f118ecd8295f492b9617da413c83d) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/35fd4d41 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/35fd4d41 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/35fd4d41 Branch: refs/heads/branch-2.8 Commit: 35fd4d4124a06d6a3e01aee0aed3e5b240631995 Parents: 3de0ff0 Author: Akira Ajisaka <[email protected]> Authored: Mon Apr 11 01:31:49 2016 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Mon Apr 11 01:33:02 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/35fd4d41/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 9f18dcc..1e9a826 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));
