Repository: hadoop Updated Branches: refs/heads/branch-2 94759470b -> e9c115523
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 fbbe0bb627c1b5f333eb5d5390e709cc43517420) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e9c11552 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e9c11552 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e9c11552 Branch: refs/heads/branch-2 Commit: e9c115523338decf9b18ffcbda8f5f5e465717a5 Parents: 9475947 Author: Karthik Kambatla <ka...@apache.org> Authored: Fri Jun 17 22:12:50 2016 -0700 Committer: Karthik Kambatla <ka...@apache.org> Committed: Fri Jun 17 22:13:18 2016 -0700 ---------------------------------------------------------------------- .../server/resourcemanager/scheduler/fair/TestFairScheduler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e9c11552/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 ---------------------------------------------------------------------- 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 d426243..beb0541 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)); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
