Index: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java =================================================================== --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java (revision 1579514) +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java (working copy) @@ -32,6 +32,9 @@ import org.apache.hadoop.yarn.event.Dispatcher; import org.apache.hadoop.yarn.event.EventHandler; import org.apache.hadoop.yarn.exceptions.YarnRuntimeException; +import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp; +import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt; +import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptState; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.QueueMetrics; import org.junit.Before; import org.junit.Test; @@ -49,6 +52,8 @@ private Log LOG = LogFactory.getLog(TestRMHA.class); private final Configuration configuration = new YarnConfiguration(); private MockRM rm = null; + private RMApp app = null; + private RMAppAttempt attempt = null; private static final String STATE_ERR = "ResourceManager is in wrong HA state"; @@ -103,7 +108,9 @@ try { rm.getNewAppId(); rm.registerNode("127.0.0.1:0", 2048); - rm.submitApp(1024); + app = rm.submitApp(1024); + attempt = app.getCurrentAppAttempt(); + rm.waitForState(attempt.getAppAttemptId(), RMAppAttemptState.SCHEDULED); } catch (Exception e) { fail("Unable to perform Active RM functions"); LOG.error("ActiveRM check failed", e); @@ -121,7 +128,7 @@ * 6. Stop the RM: All services should stop and RM should not be ready to * become Active */ - @Test (timeout = 30000) + @Test (timeout = 60000) public void testStartAndTransitions() throws IOException { configuration.setBoolean(YarnConfiguration.AUTO_FAILOVER_ENABLED, false); Configuration conf = new YarnConfiguration(configuration);