diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java index e139df6..8c0f878 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java @@ -3036,6 +3036,9 @@ public void testHeadRoomCalculationWithDRC() throws Exception { fiCaApp1.updateResourceRequests(Collections.singletonList( TestUtils.createResourceRequest(ResourceRequest.ANY, 10*GB, 1, true, u0Priority, recordFactory))); + for (RMContainer con: fiCaApp1.getLiveContainers()) { + rm.waitForContainerState(con.getContainerId(), RMContainerState.ALLOCATED); + } cs.handle(new NodeUpdateSchedulerEvent(node)); cs.handle(new NodeUpdateSchedulerEvent(node2)); assertEquals(6*GB, fiCaApp1.getHeadroom().getMemory()); @@ -3045,6 +3048,9 @@ public void testHeadRoomCalculationWithDRC() throws Exception { fiCaApp2.updateResourceRequests(Collections.singletonList( TestUtils.createResourceRequest(ResourceRequest.ANY, 1*GB, 1, true, u0Priority, recordFactory))); + for (RMContainer con: fiCaApp2.getLiveContainers()) { + rm.waitForContainerState(con.getContainerId(), RMContainerState.ALLOCATED); + } cs.handle(new NodeUpdateSchedulerEvent(node)); cs.handle(new NodeUpdateSchedulerEvent(node2)); assertEquals(9*GB, fiCaApp2.getHeadroom().getMemory());