From c748ced4740b0c0bd332bf624b187c3119b2acf0 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Mon, 11 Apr 2016 01:31:49 +0900
Subject: [PATCH] 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)
---
 hadoop-yarn-project/CHANGES.txt                                | 3 +++
 .../java/org/apache/hadoop/yarn/server/MiniYARNCluster.java    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 03621ac6efe..36d049d3a83 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -124,6 +124,9 @@ Release 2.7.3 - UNRELEASED
     YARN-4917. Fix typos in documentation of Capacity Scheduler.
     (Takashi Ohnishi via iwasakims)
 
+    YARN-4938. MiniYarnCluster should not request transitionToActive to RM
+    on non-HA environment. (Eric Badger via aajisaka)
+
 Release 2.7.2 - 2016-01-25
 
   INCOMPATIBLE CHANGES
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 d4459322f98..590d942832b 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
@@ -445,7 +445,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));