[YARN-5678] Log demand as demand in FSLeafQueue and FSParentQueue

• Type: Bug
• Status: Resolved
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 3.0.0-alpha1
• Fix Version/s: 2.9.0, 3.0.0-alpha2
• Component/s: fairscheduler
• Hadoop Flags: Reviewed
• Assignee: Yufei Gu
• Reporter: Yufei Gu
• Created: 26/Sep/16 23:55
• Updated: 03/Oct/16 13:09
• Resolved: 03/Oct/16 05:15

Description

  
private void updateDemandForApp(FSAppAttempt sched, Resource maxRes) {
    sched.updateDemand();
    Resource toAdd = sched.getDemand();
    if (LOG.isDebugEnabled()) {
      LOG.debug("Counting resource from " + sched.getName() + " " + toAdd
          + "; Total resource consumption for " + getName() + " now "
          + demand);
    }
    demand = Resources.add(demand, toAdd);
    demand = Resources.componentwiseMin(demand, maxRes);
  }

Change the "resource consumption" to "resource demand", since at that time resources haven't been consumed yet.