YARN-10286. PendingContainers bugs in the scheduler outputs. Contributed by Andras Gyori

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

@@ -62,6 +62,7 @@ public class FairSchedulerQueueInfo {
   private ResourceInfo reservedResources;
   private ResourceInfo maxContainerAllocation;
 
+  private long pendingContainers;
   private long allocatedContainers;
   private long reservedContainers;
 
@@ -114,6 +115,7 @@ public class FairSchedulerQueueInfo {
 
     allocatedContainers = queue.getMetrics().getAllocatedContainers();
     reservedContainers = queue.getMetrics().getReservedContainers();
+    pendingContainers = queue.getMetrics().getPendingContainers();
 
     if (allocConf.isReservable(queueName) &&
         !allocConf.getShowReservationAsQueues(queueName)) {
@@ -128,6 +130,8 @@ public class FairSchedulerQueueInfo {
     return allocatedContainers;
   }
 
+  public long getPendingContainers() { return pendingContainers; }
+
   public long getReservedContainers() {
     return reservedContainers;
   }

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 |