Repository: hadoop Updated Branches: refs/heads/branch-2 7654b5216 -> b9549e108
YARN-6802. Add max AM resource and AM resource usage to leaf queue view in FairScheduler WebUI. (YunFan Zhou via Yufei Gu) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b9549e10 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b9549e10 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b9549e10 Branch: refs/heads/branch-2 Commit: b9549e108ec6e8b4d1c6b40aa82618b3ac96eba1 Parents: 7654b52 Author: Yufei Gu <[email protected]> Authored: Fri Aug 4 17:20:01 2017 -0700 Committer: Yufei Gu <[email protected]> Committed: Fri Aug 4 17:23:44 2017 -0700 ---------------------------------------------------------------------- .../webapp/FairSchedulerPage.java | 2 ++ .../webapp/dao/FairSchedulerQueueInfo.java | 24 ++++++++++++++++++++ 2 files changed, 26 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b9549e10/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java index 5f46841..4b817e7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java @@ -72,6 +72,8 @@ public class FairSchedulerPage extends RmView { ResponseInfo ri = info("\'" + qinfo.getQueueName() + "\' Queue Status"). _("Used Resources:", qinfo.getUsedResources().toString()). _("Demand Resources:", qinfo.getDemandResources().toString()). + _("AM Used Resources:", qinfo.getAMUsedResources().toString()). + _("AM Max Resources:", qinfo.getAMMaxResources().toString()). _("Num Active Applications:", qinfo.getNumActiveApplications()). _("Num Pending Applications:", qinfo.getNumPendingApplications()). _("Min Resources:", qinfo.getMinResources().toString()). http://git-wip-us.apache.org/repos/asf/hadoop/blob/b9549e10/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 ---------------------------------------------------------------------- diff --git a/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 b/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 index fa14bae..a79194d 100644 --- a/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 +++ b/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 @@ -28,6 +28,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlTransient; +import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.AllocationConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSLeafQueue; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSQueue; @@ -54,6 +55,8 @@ public class FairSchedulerQueueInfo { private ResourceInfo minResources; private ResourceInfo maxResources; private ResourceInfo usedResources; + private ResourceInfo amUsedResources; + private ResourceInfo amMaxResources; private ResourceInfo demandResources; private ResourceInfo steadyFairResources; private ResourceInfo fairResources; @@ -83,6 +86,13 @@ public class FairSchedulerQueueInfo { clusterResources = new ResourceInfo(scheduler.getClusterResource()); usedResources = new ResourceInfo(queue.getResourceUsage()); + amUsedResources = new ResourceInfo(Resource.newInstance( + queue.getMetrics().getAMResourceUsageMB(), + queue.getMetrics().getAMResourceUsageVCores())); + amMaxResources = new ResourceInfo(Resource.newInstance( + queue.getMetrics().getMaxAMShareMB(), + queue.getMetrics().getMaxAMShareVCores())); + demandResources = new ResourceInfo(queue.getDemand()); fractionMemUsed = (float)usedResources.getMemorySize() / clusterResources.getMemorySize(); @@ -205,6 +215,20 @@ public class FairSchedulerQueueInfo { } /** + * @return the am used resource of this queue. + */ + public ResourceInfo getAMUsedResources() { + return amUsedResources; + } + + /** + * @return the am max resource of this queue. + */ + public ResourceInfo getAMMaxResources() { + return amMaxResources; + } + + /** * @return the demand resource of this queue. */ public ResourceInfo getDemandResources() { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
