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

YARN-5678. Log demand as demand in FSLeafQueue and FSParentQueue. (Yufei Gu via kasha) 

(cherry picked from commit 82857037b6)
This commit is contained in:
Karthik Kambatla 2016-10-02 22:09:43 -07:00
parent 6dd747b6bc
commit 57726eed83
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java
View File

@ -295,7 +295,7 @@ public class FSLeafQueue extends FSQueue {
Resource toAdd = sched.getDemand(); Resource toAdd = sched.getDemand();
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
LOG.debug("Counting resource from " + sched.getName() + " " + toAdd LOG.debug("Counting resource from " + sched.getName() + " " + toAdd
+ "; Total resource consumption for " + getName() + " now " + "; Total resource demand for " + getName() + " now "
+ demand); + demand);
} }
demand = Resources.add(demand, toAdd); demand = Resources.add(demand, toAdd);

10
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSParentQueue.java
View File

@ -158,13 +158,13 @@ public class FSParentQueue extends FSQueue {
for (FSQueue childQueue : childQueues) { for (FSQueue childQueue : childQueues) {
childQueue.updateDemand(); childQueue.updateDemand();
Resource toAdd = childQueue.getDemand(); Resource toAdd = childQueue.getDemand();
if (LOG.isDebugEnabled()) {
LOG.debug("Counting resource from " + childQueue.getName() + " " +
toAdd + "; Total resource consumption for " + getName() +
" now " + demand);
}
demand = Resources.add(demand, toAdd); demand = Resources.add(demand, toAdd);
demand = Resources.componentwiseMin(demand, maxShare); demand = Resources.componentwiseMin(demand, maxShare);
if (LOG.isDebugEnabled()) {
LOG.debug("Counting resource from " + childQueue.getName() + " " +
toAdd + "; Total resource demand for " + getName() +
" now " + demand);
}
if (Resources.equals(demand, maxShare)) { if (Resources.equals(demand, maxShare)) {
break; break;
} }