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 aa...@apache.org on 2016/04/10 18:36:40 UTC
hadoop git commit: YARN-4938. MiniYarnCluster should not request
transitionToActive to RM on non-HA environment. Contributed by Eric Badger.
Repository: hadoop
Updated Branches:
refs/heads/trunk ff95fd547 -> 1b78b2ba1
YARN-4938. MiniYarnCluster should not request transitionToActive to RM on non-HA environment. Contributed by Eric Badger.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1b78b2ba
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1b78b2ba
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1b78b2ba
Branch: refs/heads/trunk
Commit: 1b78b2ba17cffdd19ae056555dd7f89b7a3eb06a
Parents: ff95fd5
Author: Akira Ajisaka <aa...@apache.org>
Authored: Mon Apr 11 01:31:49 2016 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Mon Apr 11 01:31: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/1b78b2ba/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));