From fbbe0bb627c1b5f333eb5d5390e709cc43517420 Mon Sep 17 00:00:00 2001 From: Karthik Kambatla Date: Fri, 17 Jun 2016 22:12:50 -0700 Subject: [PATCH] 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) --- .../resourcemanager/scheduler/fair/TestFairScheduler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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/fair/TestFairScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java index ec77a9b13d..9f22e50958 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java @@ -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));