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

Backport part of YARN-3273 to rename CapacitySchedulerLeafQueueInfo#aMResourceLimit to AMResourceLimit. Contributed by Rohith Sharmaks

This commit is contained in:
Jian He 2015-03-17 22:05:23 -07:00
parent 26c35438f3
commit 54e63c52c9
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,6 +331,10 @@ Release 2.7.0 - UNRELEASED
YARN-2854. Updated the documentation of the timeline service and the generic YARN-2854. Updated the documentation of the timeline service and the generic
history service. (Naganarasimha G R via zjshen) history service. (Naganarasimha G R via zjshen)
Backport part of YARN-3273 to rename
CapacitySchedulerLeafQueueInfo#aMResourceLimit to AMResourceLimit.
(Rohith via jianhe)
OPTIMIZATIONS OPTIMIZATIONS
YARN-2990. FairScheduler's delay-scheduling always waits for node-local and YARN-2990. FairScheduler's delay-scheduling always waits for node-local and

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/CapacitySchedulerLeafQueueInfo.java
View File

@ -35,7 +35,7 @@ public class CapacitySchedulerLeafQueueInfo extends CapacitySchedulerQueueInfo {
protected int userLimit; protected int userLimit;
protected UsersInfo users; // To add another level in the XML protected UsersInfo users; // To add another level in the XML
protected float userLimitFactor; protected float userLimitFactor;
protected ResourceInfo aMResourceLimit; protected ResourceInfo AMResourceLimit;
protected ResourceInfo userAMResourceLimit; protected ResourceInfo userAMResourceLimit;
protected boolean preemptionDisabled; protected boolean preemptionDisabled;
@ -52,7 +52,7 @@ public class CapacitySchedulerLeafQueueInfo extends CapacitySchedulerQueueInfo {
userLimit = q.getUserLimit(); userLimit = q.getUserLimit();
users = new UsersInfo(q.getUsers()); users = new UsersInfo(q.getUsers());
userLimitFactor = q.getUserLimitFactor(); userLimitFactor = q.getUserLimitFactor();
aMResourceLimit = new ResourceInfo(q.getAMResourceLimit()); AMResourceLimit = new ResourceInfo(q.getAMResourceLimit());
userAMResourceLimit = new ResourceInfo(q.getUserAMResourceLimit()); userAMResourceLimit = new ResourceInfo(q.getUserAMResourceLimit());
preemptionDisabled = q.getPreemptionDisabled(); preemptionDisabled = q.getPreemptionDisabled();
} }
@ -91,7 +91,7 @@ public class CapacitySchedulerLeafQueueInfo extends CapacitySchedulerQueueInfo {
} }
public ResourceInfo getAMResourceLimit() { public ResourceInfo getAMResourceLimit() {
return aMResourceLimit; return AMResourceLimit;
} }
public ResourceInfo getUserAMResourceLimit() { public ResourceInfo getUserAMResourceLimit() {

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

@ -273,7 +273,7 @@ public class TestApplicationLimits {
LeafQueue queue = (LeafQueue)queues.get(A); LeafQueue queue = (LeafQueue)queues.get(A);
LOG.info("Queue 'A' -" + LOG.info("Queue 'A' -" +
" aMResourceLimit=" + queue.getAMResourceLimit() + " AMResourceLimit=" + queue.getAMResourceLimit() +
" UserAMResourceLimit=" + " UserAMResourceLimit=" +
queue.getUserAMResourceLimit()); queue.getUserAMResourceLimit());