YARN-11484. Fix CheckStyle.

Author: slfan1989

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetQueueInfoRequest.java

@@ -115,12 +115,20 @@ public abstract class GetQueueInfoRequest {
   @Stable
   public abstract void setRecursive(boolean recursive);
 
+  /**
+   * Get SubClusterId.
+   * @return SubClusterId.
+   */
   @Public
   @Stable
   public abstract String getSubClusterId();
 
+  /**
+   * Set SubClusterId.
+   * @param subClusterId SubClusterId.
+   */
   @Public
   @Stable
-  public abstract void setSubClusterId();
+  public abstract void setSubClusterId(String subClusterId);
 }
 

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

@@ -350,82 +350,162 @@ public abstract void setIntraQueuePreemptionDisabled(
   @Stable
   public abstract String getSchedulerType();
 
+  /**
+   * Set Scheduler type.
+   * @param schedulerType scheduler Type.
+   */
   @Private
   @Unstable
   public abstract void setSchedulerType(String schedulerType);
 
+  /**
+   * Get the minimum resource VCore.
+   * @return minimum resource VCore.
+   */
   @Public
   @Stable
   public abstract int getMinResourceVCore();
 
+  /**
+   * Set the minimum resource VCore.
+   * @param vCore minimum resource VCore.
+   */
   @Private
   @Unstable
   public abstract void setMinResourceVCore(int vCore);
 
+  /**
+   * Get the minimum resource Memory.
+   * @return minimum resource Memory.
+   */
   @Public
   @Stable
   public abstract long getMinResourceMemory();
 
+  /**
+   * Set the minimum resource Memory.
+   * @param memory minimum resource Memory.
+   */
   @Private
   @Unstable
   public abstract void setMinResourceMemory(long memory);
 
+  /**
+   * Get the maximum resource VCore.
+   * @return maximum resource VCore.
+   */
   @Public
   @Stable
   public abstract int getMaxResourceVCore();
 
+  /**
+   * Set the maximum resource Memory.
+   * @param vCore maximum resource VCore.
+   */
   @Private
   @Unstable
   public abstract void setMaxResourceVCore(int vCore);
 
+  /**
+   * Get the maximum resource Memory.
+   * @return maximum resource Memory.
+   */
   @Public
   @Stable
   public abstract long getMaxResourceMemory();
 
+  /**
+   * Set the maximum resource Memory.
+   * @param memory maximum resource Memory.
+   */
   @Private
   @Unstable
   public abstract void setMaxResourceMemory(long memory);
 
+  /**
+   * Get the reserved resource VCore.
+   * @return reserved resource VCore.
+   */
   @Public
   @Stable
   public abstract int getReservedResourceVCore();
 
+  /**
+   * Set the reserved resource VCore.
+   * @param vCore reserved resource VCore.
+   */
   @Private
   @Unstable
   public abstract void setReservedResourceVCore(int vCore);
 
+  /**
+   * Get the reserved resource Memory.
+   * @return reserved resource Memory.
+   */
   @Public
   @Stable
   public abstract long getReservedResourceMemory();
 
+  /**
+   * Set the reserved resource Memory.
+   * @param memory reserved resource Memory.
+   */
   @Private
   @Unstable
   public abstract void setReservedResourceMemory(long memory);
 
+  /**
+   * Get the SteadyFairShare VCore.
+   * @return SteadyFairShare VCore.
+   */
   @Public
   @Stable
   public abstract int getSteadyFairShareVCore();
 
+  /**
+   * Set the SteadyFairShare VCore.
+   * @param vCore SteadyFairShare VCore.
+   */
   @Private
   @Unstable
   public abstract void setSteadyFairShareVCore(int vCore);
 
+  /**
+   * Get the SteadyFairShare Memory.
+   * @return SteadyFairShare Memory.
+   */
   @Public
   @Stable
   public abstract long getSteadyFairShareMemory();
 
+  /**
+   * Set the SteadyFairShare Memory.
+   * @param memory SteadyFairShare Memory.
+   */
   @Private
   @Unstable
   public abstract void setSteadyFairShareMemory(long memory);
 
+  /**
+   * Get the SubClusterId.
+   * @return the SubClusterId.
+   */
   @Public
   @Stable
   public abstract String getSubClusterId();
 
+  /**
+   * Set the SubClusterId.
+   * @param subClusterId the SubClusterId.
+   */
   @Private
   @Unstable
   public abstract void setSubClusterId(String subClusterId);
 
+  /**
+   * Get the MaxRunningApp.
+   * @return The number of MaxRunningApp.
+   */
   @Public
   @Stable
   public abstract int getMaxRunningApp();

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/YarnClient.java

@@ -464,11 +464,25 @@ public abstract Token getRMDelegationToken(Text renewer)
    * @throws YarnException
    *           in case of errors or if YARN rejects the request due to
    *           access-control restrictions.
-   * @throws IOException
+   * @throws IOException I/O exception has occurred.
    */
   public abstract QueueInfo getQueueInfo(String queueName) throws YarnException,
       IOException;
 
+  /**
+   * <p>
+   * Get information ({@link QueueInfo}) about a given <em>queue</em>.
+   * </p>
+   *
+   * @param queueName
+   *          Name of the queue whose information is needed
+   * @param subClusterId sub-cluster Id
+   * @return
+   * @throws YarnException
+   *           in case of errors or if YARN rejects the request due to
+   *           access-control restrictions.
+   * @throws IOException I/O exception has occurred.
+   */
   public abstract QueueInfo getQueueInfo(String queueName, String subClusterId)
       throws YarnException, IOException;
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java

@@ -735,6 +735,18 @@ public Token getRMDelegationToken(Text renewer)
     return request;
   }
 
+  private GetQueueInfoRequest getQueueInfoRequest(
+      String queueName, String subClusterId, boolean includeApplications,
+      boolean includeChildQueues, boolean recursive) {
+    GetQueueInfoRequest request = Records.newRecord(GetQueueInfoRequest.class);
+    request.setQueueName(queueName);
+    request.setSubClusterId(subClusterId);
+    request.setIncludeApplications(includeApplications);
+    request.setIncludeChildQueues(includeChildQueues);
+    request.setRecursive(recursive);
+    return request;
+  }
+
   @Override
   public QueueInfo getQueueInfo(String queueName) throws YarnException,
       IOException {
@@ -747,7 +759,10 @@ public QueueInfo getQueueInfo(String queueName) throws YarnException,
   @Override
   public QueueInfo getQueueInfo(String queueName,
       String subClusterId) throws YarnException, IOException {
-    return null;
+    GetQueueInfoRequest request =
+        getQueueInfoRequest(queueName, subClusterId, true, false, false);
+    Records.newRecord(GetQueueInfoRequest.class);
+    return rmClient.getQueueInfo(request).getQueueInfo();
   }
 
   @Override

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

@@ -39,7 +39,6 @@
 import org.apache.hadoop.yarn.api.records.NodeLabel;
 import org.apache.hadoop.yarn.api.records.QueueInfo;
 import org.apache.hadoop.yarn.client.util.FormattingCLIUtils;
-import org.apache.hadoop.yarn.client.util.YarnClientUtils;
 import org.apache.hadoop.yarn.exceptions.YarnException;
 
 import org.apache.hadoop.classification.VisibleForTesting;
@@ -53,8 +52,6 @@ public class QueueCLI extends YarnCLI {
 
   public static final String ALLTAG = "all";
 
-
-
   public static void main(String[] args) throws Exception {
     QueueCLI cli = new QueueCLI();
     cli.setSysOutPrintStream(System.out);
@@ -94,10 +91,12 @@ public int run(String[] args) throws Exception {
         return -1;
       }
       String queue = cliParser.getOptionValue(STATUS_CMD);
-      if (isYarnFederationEnabled(getConf())) {
-        return listQueue(cliParser.getOptionValue(STATUS_CMD));
+      String subClusterId = cliParser.getOptionValue(OPTION_SUBCLUSTERID);
+      if (isYarnFederationEnabled(getConf()) && StringUtils.isNotBlank(subClusterId)) {
+        return listQueue(queue, subClusterId);
+      } else {
+        return listQueue(queue);
       }
-      return listQueue(cliParser.getOptionValue(STATUS_CMD));
     } else if (cliParser.hasOption(HELP_CMD)) {
       printUsage(opts);
       return 0;
@@ -127,12 +126,12 @@ void printUsage(Options opts) {
   /**
    * Lists the Queue Information matching the given queue name.
    * 
-   * @param queueName
-   * @throws YarnException
-   * @throws IOException
+   * @param queueName Queue name to be queried.
+   * @throws YarnException YarnException indicates exceptions from yarn servers.
+   * @throws IOException I/O exception has occurred.
+   * @return 0, the command execution is successful; -1, the command execution fails.
    */
-  private int listQueue(String queueName)
-      throws YarnException, IOException {
+  private int listQueue(String queueName) throws YarnException, IOException {
     int rc;
     PrintWriter writer = new PrintWriter(
         new OutputStreamWriter(sysout, Charset.forName("UTF-8")));
@@ -151,6 +150,34 @@ private int listQueue(String queueName)
     return rc;
   }
 
+  /**
+   * Lists the Queue Information matching the given queue name.
+   *
+   * @param queueName Queue name to be queried.
+   * @param subClusterId Subcluster id.
+   * @throws YarnException YarnException indicates exceptions from yarn servers.
+   * @throws IOException I/O exception has occurred.
+   * @return 0, the command execution is successful; -1, the command execution fails.
+   */
+  private int listQueue(String queueName, String subClusterId)
+      throws YarnException, IOException {
+    int rc;
+    PrintWriter writer = new PrintWriter(
+       new OutputStreamWriter(sysout, Charset.forName("UTF-8")));
+    QueueInfo queueInfo = client.getQueueInfo(queueName, subClusterId);
+    if (queueInfo != null) {
+      writer.println("Queue Information : ");
+      printQueueInfo(writer, queueInfo);
+      rc = 0;
+    } else {
+      writer.println("Cannot get queue from RM by queueName = " + queueName
+          + ", subClusterId = " + subClusterId + " please check.");
+      rc = -1;
+    }
+    writer.flush();
+    return rc;
+  }
+
   /**
    * List information about all child queues based on the parent queue.
    * @param parentQueueName The name of the payment queue.