Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge r1593804 from trunk: YARN-2011. Fix typo and warning in TestLeafQueue (Contributed by Chen He) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593805 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Junping Du 2014-05-11 15:16:32 +00:00
parent 884ff10d48
commit 62497eb64f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-yarn-project/CHANGES.txt
View File

@ -85,6 +85,8 @@ Release 2.5.0 - UNRELEASED
YARN-2018. TestClientRMService.testTokenRenewalWrongUser fails after YARN-2018. TestClientRMService.testTokenRenewalWrongUser fails after
HADOOP-10562 (Ming Ma via Arpit Agarwal) HADOOP-10562 (Ming Ma via Arpit Agarwal)
YARN-2011. Fix typo and warning in TestLeafQueue (Chen He via junping_du)
Release 2.4.1 - UNRELEASED Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

7
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java
View File

@ -350,8 +350,7 @@ public class TestLeafQueue {
// Submit applications // Submit applications
final ApplicationAttemptId appAttemptId_0 = TestUtils final ApplicationAttemptId appAttemptId_0 = TestUtils
.getMockApplicationAttemptId(0, 1); .getMockApplicationAttemptId(0, 1);
FiCaSchedulerApp app_0 = new FiCaSchedulerApp(appAttemptId_0, user_0, a, null,
rmContext);
AppAddedSchedulerEvent addAppEvent = AppAddedSchedulerEvent addAppEvent =
new AppAddedSchedulerEvent(appAttemptId_0.getApplicationId(), new AppAddedSchedulerEvent(appAttemptId_0.getApplicationId(),
a.getQueueName(), user_0); a.getQueueName(), user_0);
@ -687,7 +686,7 @@ public class TestLeafQueue {
assertEquals(2*GB, app_0.getCurrentConsumption().getMemory()); assertEquals(2*GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0*GB, app_1.getCurrentConsumption().getMemory()); assertEquals(0*GB, app_1.getCurrentConsumption().getMemory());
assertEquals(0*GB, app_0.getHeadroom().getMemory()); // User limit = 2G assertEquals(0*GB, app_0.getHeadroom().getMemory()); // User limit = 2G
assertEquals(0*GB, app_0.getHeadroom().getMemory()); // User limit = 2G assertEquals(0*GB, app_1.getHeadroom().getMemory()); // User limit = 2G
// Again one to user_0 since he hasn't exceeded user limit yet // Again one to user_0 since he hasn't exceeded user limit yet
a.assignContainers(clusterResource, node_0); a.assignContainers(clusterResource, node_0);
@ -695,7 +694,7 @@ public class TestLeafQueue {
assertEquals(2*GB, app_0.getCurrentConsumption().getMemory()); assertEquals(2*GB, app_0.getCurrentConsumption().getMemory());
assertEquals(1*GB, app_1.getCurrentConsumption().getMemory()); assertEquals(1*GB, app_1.getCurrentConsumption().getMemory());
assertEquals(0*GB, app_0.getHeadroom().getMemory()); // 3G - 2G assertEquals(0*GB, app_0.getHeadroom().getMemory()); // 3G - 2G
assertEquals(0*GB, app_0.getHeadroom().getMemory()); // 3G - 2G assertEquals(0*GB, app_1.getHeadroom().getMemory()); // 3G - 2G
// Submit requests for app_1 and set max-cap // Submit requests for app_1 and set max-cap
a.setMaxCapacity(.1f); a.setMaxCapacity(.1f);