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

YARN-4995. FairScheduler: Display per-queue demand on the scheduler page. (xupeng via kasha)

Browse Source 
(cherry picked from commit 4b4e4c6ba83bc5c41d7bb69bb2483bcfe894a260)
(cherry picked from commit f96b2b6fac84f565d4d0cf78c927f0b116364cfc)
This commit is contained in:
Karthik Kambatla 2016-05-11 17:36:21 -07:00
parent 5f04795aed
commit a9b0041abc
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java
View File

@ -71,6 +71,7 @@ static class LeafQueueBlock extends HtmlBlock {
protected void render(Block html) { protected void render(Block html) {
ResponseInfo ri = info("\'" + qinfo.getQueueName() + "\' Queue Status"). ResponseInfo ri = info("\'" + qinfo.getQueueName() + "\' Queue Status").
_("Used Resources:", qinfo.getUsedResources().toString()). _("Used Resources:", qinfo.getUsedResources().toString()).
_("Demand Resources:", qinfo.getDemandResources().toString()).
_("Num Active Applications:", qinfo.getNumActiveApplications()). _("Num Active Applications:", qinfo.getNumActiveApplications()).
_("Num Pending Applications:", qinfo.getNumPendingApplications()). _("Num Pending Applications:", qinfo.getNumPendingApplications()).
_("Min Resources:", qinfo.getMinResources().toString()). _("Min Resources:", qinfo.getMinResources().toString()).

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

@ -54,6 +54,7 @@ public class FairSchedulerQueueInfo {
private ResourceInfo minResources; private ResourceInfo minResources;
private ResourceInfo maxResources; private ResourceInfo maxResources;
private ResourceInfo usedResources; private ResourceInfo usedResources;
private ResourceInfo demandResources;
private ResourceInfo steadyFairResources; private ResourceInfo steadyFairResources;
private ResourceInfo fairResources; private ResourceInfo fairResources;
private ResourceInfo clusterResources; private ResourceInfo clusterResources;
@ -79,6 +80,7 @@ public FairSchedulerQueueInfo(FSQueue queue, FairScheduler scheduler) {
clusterResources = new ResourceInfo(scheduler.getClusterResource()); clusterResources = new ResourceInfo(scheduler.getClusterResource());
usedResources = new ResourceInfo(queue.getResourceUsage()); usedResources = new ResourceInfo(queue.getResourceUsage());
demandResources = new ResourceInfo(queue.getDemand());
fractionMemUsed = (float)usedResources.getMemory() / fractionMemUsed = (float)usedResources.getMemory() /
clusterResources.getMemory(); clusterResources.getMemory();
@ -193,6 +195,13 @@ public ResourceInfo getUsedResources() {
return usedResources; return usedResources;
} }
/**
* @return the demand resource of this queue.
*/
public ResourceInfo getDemandResources() {
return demandResources;
}
/** /**
* Returns the queue's min share in as a fraction of the entire * Returns the queue's min share in as a fraction of the entire
* cluster capacity. * cluster capacity.