YARN-5082. Limit ContainerId increase in fair scheduler if the num of node app reserved reached the limit. Addendum to fix javac warning. (Arun Suresh via kasha)

(cherry picked from commit fbbe0bb627)
This commit is contained in:
Karthik Kambatla 2016-06-17 22:12:50 -07:00
parent 94759470b8
commit e9c1155233
1 changed files with 2 additions and 2 deletions

View File

@ -4512,7 +4512,7 @@ public class TestFairScheduler extends FairSchedulerTestBase {
scheduler.handle(new NodeUpdateSchedulerEvent(node2));
assertEquals(4096, scheduler.getQueueManager().getQueue("queue1").
getResourceUsage().getMemory());
getResourceUsage().getMemorySize());
//container will be reserved at node1
RMContainer reservedContainer1 =
@ -4532,7 +4532,7 @@ public class TestFairScheduler extends FairSchedulerTestBase {
app1, RMAppAttemptState.KILLED, false));
assertEquals(0, scheduler.getQueueManager().getQueue("queue1").
getResourceUsage().getMemory());
getResourceUsage().getMemorySize());
// container will be allocated at node2
scheduler.handle(new NodeUpdateSchedulerEvent(node2));