YARN-11484. [Federation] Router Supports Yarn Client CLI Cmds.

Author: slfan1989

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/QueueInfo.java

@@ -340,4 +340,57 @@ public abstract void setQueueConfigurations(
   @Unstable
   public abstract void setIntraQueuePreemptionDisabled(
       boolean intraQueuePreemptionDisabled);
+
+  /**
+   * Get Scheduler type.
+   *
+   * @return SchedulerType.
+   */
+  @Public
+  @Stable
+  public abstract String getSchedulerType();
+
+  @Private
+  @Unstable
+  public abstract void setSchedulerType(String schedulerType);
+
+  @Public
+  @Stable
+  public abstract String getMinResource();
+
+  @Private
+  @Unstable
+  public abstract void setMinResource(String minResource);
+
+  @Public
+  @Stable
+  public abstract String getMaxResource();
+
+  @Private
+  @Unstable
+  public abstract void setMaxResource(String maxResource);
+
+  @Public
+  @Stable
+  public abstract String getReservedResource();
+
+  @Private
+  @Unstable
+  public abstract void setReservedResource(String reservedResource);
+
+  @Public
+  @Stable
+  public abstract String getSteadyFairShare();
+
+  @Private
+  @Unstable
+  public abstract void setSteadyFairShare(String fairShare);
+
+  @Public
+  @Stable
+  public abstract String getInstantaneousFairShare();
+
+  @Private
+  @Unstable
+  public abstract void setInstantaneousFairShare(String fairShare);
 }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto

@@ -636,6 +636,12 @@ message QueueInfoProto {
   optional float weight = 14;
   optional string queuePath = 15;
   optional int32 maxParallelApps = 16;
+  optional string schedulerType = 17;
+  optional string minResource = 18;
+  optional string maxResource = 19;
+  optional string reservedResource = 20;
+  optional string steadyFairShare = 21;
+  optional string instantaneousFairShare = 22;
 }
 
 message QueueConfigurationsProto {

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/QueueCLI.java

@@ -32,6 +32,7 @@
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.MissingArgumentException;
 import org.apache.commons.cli.Options;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.util.ToolRunner;
@@ -174,6 +175,49 @@ private int listChildQueues(String parentQueueName) throws IOException, YarnExce
   }
 
   private void printQueueInfo(PrintWriter writer, QueueInfo queueInfo) {
+    String schedulerType = queueInfo.getSchedulerType();
+
+    if (StringUtils.equals("FairScheduler", schedulerType)) {
+      printFairSchedulerQueue(writer, queueInfo);
+      return;
+    }
+
+    if (StringUtils.equals("CapacityScheduler", schedulerType)) {
+      printCapacitySchedulerQueue(writer, queueInfo);
+      return;
+    }
+  }
+
+  private void printFairSchedulerQueue(PrintWriter writer, QueueInfo queueInfo) {
+    writer.print("Scheduler Name : ");
+    writer.println(queueInfo.getSchedulerType());
+    writer.print("Queue Name : ");
+    writer.println(queueInfo.getQueueName());
+    writer.print("\tWeight : ");
+    DecimalFormat df = new DecimalFormat("#.00");
+    writer.println(df.format(queueInfo.getWeight()));
+    writer.print("\tState : ");
+    writer.println(queueInfo.getQueueState());
+    writer.println("\tMinResource : ");
+    writer.print(queueInfo.getMinResource());
+    writer.println("\tMaxResource : ");
+    writer.print(queueInfo.getMaxResource());
+    writer.println("\tReservedResource : ");
+    writer.print(queueInfo.getReservedResource());
+    writer.println("\tSteadyFairShare : ");
+    writer.print(queueInfo.getSteadyFairShare());
+    writer.println("\tInstantaneousFairShare : ");
+    writer.print(queueInfo.getSteadyFairShare());
+    Boolean queuePreemption = queueInfo.getPreemptionDisabled();
+    if (queuePreemption != null) {
+      writer.println("\tqueue Preemption : ");
+      writer.print(queuePreemption ? "disabled" : "enabled");
+    }
+  }
+
+  private void printCapacitySchedulerQueue(PrintWriter writer, QueueInfo queueInfo) {
+    writer.print("Scheduler Name : ");
+    writer.println(queueInfo.getSchedulerType());
     writer.print("Queue Name : ");
     writer.println(queueInfo.getQueueName());
     writer.print("Queue Path : ");
@@ -195,8 +239,8 @@ private void printQueueInfo(PrintWriter writer, QueueInfo queueInfo) {
     writer.print("\tDefault Node Label expression : ");
     String nodeLabelExpression = queueInfo.getDefaultNodeLabelExpression();
     nodeLabelExpression =
-        (nodeLabelExpression == null || nodeLabelExpression.trim().isEmpty())
-            ? NodeLabel.DEFAULT_NODE_LABEL_PARTITION : nodeLabelExpression;
+            (nodeLabelExpression == null || nodeLabelExpression.trim().isEmpty())
+                    ? NodeLabel.DEFAULT_NODE_LABEL_PARTITION : nodeLabelExpression;
     writer.println(nodeLabelExpression);
 
     Set<String> nodeLabels = queueInfo.getAccessibleNodeLabels();
@@ -208,7 +252,7 @@ private void printQueueInfo(PrintWriter writer, QueueInfo queueInfo) {
       }
       labelList.append(nodeLabel);
     }
-    writer.println(labelList.toString());
+    writer.println(labelList);
 
     Boolean preemptStatus = queueInfo.getPreemptionDisabled();
     if (preemptStatus != null) {

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java

@@ -553,4 +553,76 @@ public void setIntraQueuePreemptionDisabled(
     maybeInitBuilder();
     builder.setIntraQueuePreemptionDisabled(intraQueuePreemptionDisabled);
   }
+
+  @Override
+  public String getSchedulerType() {
+   QueueInfoProtoOrBuilder p = viaProto ? proto : builder;
+   return (p.hasSchedulerType()) ? p.getSchedulerType() : null;
+  }
+
+  @Override
+  public void setSchedulerType(String schedulerType) {
+    maybeInitBuilder();
+    builder.setSchedulerType(schedulerType);
+  }
+
+  @Override
+  public String getMinResource() {
+    QueueInfoProtoOrBuilder p = viaProto ? proto : builder;
+    return (p.hasMinResource()) ? p.getMinResource() : null;
+  }
+
+  @Override
+  public void setMinResource(String minResource) {
+    maybeInitBuilder();
+    builder.setMinResource(minResource);
+  }
+
+  @Override
+  public String getMaxResource() {
+    QueueInfoProtoOrBuilder p = viaProto ? proto : builder;
+    return (p.hasMaxResource()) ? p.getMaxResource() : null;
+  }
+
+  @Override
+  public void setMaxResource(String maxResource) {
+    maybeInitBuilder();
+    builder.setMaxResource(maxResource);
+  }
+
+  @Override
+  public String getReservedResource() {
+    QueueInfoProtoOrBuilder p = viaProto ? proto : builder;
+    return (p.hasReservedResource()) ? p.getReservedResource() : null;
+  }
+
+  @Override
+  public void setReservedResource(String reservedResource) {
+    maybeInitBuilder();
+    builder.setReservedResource(reservedResource);
+  }
+
+  @Override
+  public String getSteadyFairShare() {
+    QueueInfoProtoOrBuilder p = viaProto ? proto : builder;
+    return (p.hasSteadyFairShare()) ? p.getSteadyFairShare() : null;
+  }
+
+  @Override
+  public void setSteadyFairShare(String fairShare) {
+    maybeInitBuilder();
+    builder.setSteadyFairShare(fairShare);
+  }
+
+  @Override
+  public String getInstantaneousFairShare() {
+    QueueInfoProtoOrBuilder p = viaProto ? proto : builder;
+    return (p.hasInstantaneousFairShare()) ? p.getInstantaneousFairShare() : null;
+  }
+
+  @Override
+  public void setInstantaneousFairShare(String fairShare) {
+    maybeInitBuilder();
+    builder.setInstantaneousFairShare(fairShare);
+  }
 }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSQueueInfoProvider.java

@@ -39,6 +39,7 @@ private CSQueueInfoProvider() {
 
   public static QueueInfo getQueueInfo(AbstractCSQueue csQueue) {
     QueueInfo queueInfo = RECORD_FACTORY.newRecordInstance(QueueInfo.class);
+    queueInfo.setSchedulerType("CapacityScheduler");
     queueInfo.setQueueName(csQueue.getQueuePathObject().getLeafName());
     queueInfo.setQueuePath(csQueue.getQueuePathObject().getFullPath());
     queueInfo.setAccessibleNodeLabels(csQueue.getAccessibleNodeLabels());

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java

@@ -234,6 +234,7 @@ public Priority getPriority() {
   @Override
   public QueueInfo getQueueInfo(boolean includeChildQueues, boolean recursive) {
     QueueInfo queueInfo = recordFactory.newRecordInstance(QueueInfo.class);
+    queueInfo.setSchedulerType("FairScheduler");
     queueInfo.setQueueName(getQueueName());
 
     if (scheduler.getClusterResource().getMemorySize() == 0) {
@@ -250,7 +251,14 @@ public QueueInfo getQueueInfo(boolean includeChildQueues, boolean recursive) {
           getFairShare().getMemorySize());
     }
 
-    ArrayList<QueueInfo> childQueueInfos = new ArrayList<QueueInfo>();
+    queueInfo.setWeight(getWeight());
+    queueInfo.setMaxResource(getMaxShare().toString());
+    queueInfo.setMinResource(getMinShare().toString());
+    queueInfo.setSteadyFairShare(getSteadyFairShare().toString());
+    queueInfo.setInstantaneousFairShare(getFairShare().toString());
+    queueInfo.setPreemptionDisabled(isPreemptable());
+
+    ArrayList<QueueInfo> childQueueInfos = new ArrayList<>();
     if (includeChildQueues) {
       Collection<FSQueue> childQueues = getChildQueues();
       for (FSQueue child : childQueues) {