diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationPriority.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationPriority.java index 8bd5314..a2baf17 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationPriority.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationPriority.java @@ -683,37 +683,28 @@ protected Dispatcher createDispatcher() { defaultQueue = (LeafQueue) ((CapacityScheduler) scheduler).getQueue("default"); - // wait for all applications to get added to scheduler - int count = 5; - while (count-- > 0) { - if ((defaultQueue.getNumActiveApplications() + defaultQueue - .getNumPendingApplications()) == 3) { - break; - } - Thread.sleep(500); - } - // Before NM registration, AMResourceLimit threshold is 0. So no // applications get activated. Assert.assertEquals(0, defaultQueue.getNumActiveApplications()); + Assert.assertEquals(3, defaultQueue.getNumPendingApplications()); // NM resync to new RM nm1.registerNode(); dispatcher1.await(); - Assert.assertEquals(2, defaultQueue.getNumActiveApplications()); - Assert.assertEquals(1, defaultQueue.getNumPendingApplications()); - - - // wait for activating one applications - count = 5; + // wait for all applications to get added to scheduler + int count = 5; while (count-- > 0) { - if (defaultQueue.getOrderingPolicy().getSchedulableEntities().size() == 2) { + if ((defaultQueue.getNumActiveApplications() + + defaultQueue.getNumPendingApplications()) == 3) { break; } Thread.sleep(500); } + Assert.assertEquals(2, defaultQueue.getNumActiveApplications()); + Assert.assertEquals(1, defaultQueue.getNumPendingApplications()); + // verify for order of activated applications iterator iterator = defaultQueue.getOrderingPolicy().getSchedulableEntities().iterator();