From e0a0741ac86dcc4f98ec2f9739b70b3697a4d0c0 Mon Sep 17 00:00:00 2001 From: Szilard Nemeth Date: Tue, 2 Jun 2020 15:41:10 +0200 Subject: [PATCH] YARN-10286. PendingContainers bugs in the scheduler outputs. Contributed by Andras Gyori --- .../resourcemanager/webapp/dao/FairSchedulerQueueInfo.java | 4 ++++ .../hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md | 3 +++ 2 files changed, 7 insertions(+) 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 f28e5b298a..9804a36099 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 @@ -60,6 +60,7 @@ public class FairSchedulerQueueInfo { private ResourceInfo reservedResources; private ResourceInfo maxContainerAllocation; + private long pendingContainers; private long allocatedContainers; private long reservedContainers; @@ -108,6 +109,7 @@ public FairSchedulerQueueInfo(FSQueue queue, FairScheduler scheduler) { allocatedContainers = queue.getMetrics().getAllocatedContainers(); reservedContainers = queue.getMetrics().getReservedContainers(); + pendingContainers = queue.getMetrics().getPendingContainers(); if (allocConf.isReservable(queueName) && !allocConf.getShowReservationAsQueues(queueName)) { @@ -122,6 +124,8 @@ public long getAllocatedContainers() { return allocatedContainers; } + public long getPendingContainers() { return pendingContainers; } + public long getReservedContainers() { return reservedContainers; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md index 4b8c2cb559..a30221d7a6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md @@ -338,6 +338,9 @@ The capacity scheduler supports hierarchical queues. This one request will print | numActiveApplications | int | The number of active applications in this queue | | numPendingApplications | int | The number of pending applications in this queue | | numContainers | int | The number of containers being used | +| allocatedContainers | int | The number of allocated containers in this queue | +| reservedContainers | int | The number of reserved containers in this queue | +| pendingContainers | int | The number of pending containers in this queue | | maxApplications | int | The maximum number of applications this queue can have | | maxApplicationsPerUser | int | The maximum number of applications per user this queue can have | | maxActiveApplications | int | The maximum number of active applications this queue can have |