YARN-11536. [Federation] Router CLI Supports Batch Save the SubClusterPolicyConfiguration Of Queues.

Author: slfan1989

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

@@ -71,7 +71,7 @@ public class RouterCLI extends Configured implements Tool {
         "set the state of the subCluster to SC_LOST."))
          // Command2: policy
         .put("-policy", new UsageInfo(
-        "[-s|--save [queue;router weight;amrm weight;headroomalpha]]",
+        "[-s|--save [queue;router weight;amrm weight;headroomalpha]] [-bs|--batch-save [--format xml,json] [-f|--input-file fileName]]",
         "We provide a set of commands for Policy:" +
         " Include list policies, save policies, batch save policies. " +
         " (Note: The policy type will be directly read from the" +
@@ -102,8 +102,16 @@ public class RouterCLI extends Configured implements Tool {
   // Command2: policy
   // save policy
   private static final String OPTION_S = "s";
+
+  private static final String OPTION_BATCH_S = "bs";
+
   private static final String OPTION_SAVE = "save";
+
+  private static final String OPTION_BATCH_SAVE = "batch-save";
+
   private static final String CMD_POLICY = "-policy";
+  private static final String FORMAT_XML = "xml";
+  private static final String FORMAT_JSON = "json";
 
   public RouterCLI() {
     super();
@@ -161,7 +169,7 @@ private static void printHelp() {
         .append("The full syntax is: \n\n")
         .append("routeradmin\n")
         .append("   [-deregisterSubCluster [-sc|--subClusterId [subCluster Id]]\n")
-        .append("   [-policy [-s|--save [queue;router weight;amrm weight;headroomalpha]]\n")
+        .append("   [-policy [-s|--save [queue;router weight;amrm weight;headroomalpha] [-bs|--batch-save [--format xml,json] [-f|--input-file fileName]]]\n")
         .append("   [-help [cmd]]").append("\n");
     StringBuilder helpBuilder = new StringBuilder();
     System.out.println(summary);

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRouterCLI.java

@@ -120,8 +120,8 @@ private DeregisterSubClusterResponse generateAllSubClusterData() {
   public void testHelp() throws Exception {
     ByteArrayOutputStream dataOut = new ByteArrayOutputStream();
     ByteArrayOutputStream dataErr = new ByteArrayOutputStream();
-    System.setOut(new PrintStream(dataOut));
-    System.setErr(new PrintStream(dataErr));
+    // System.setOut(new PrintStream(dataOut));
+    // System.setErr(new PrintStream(dataErr));
 
     String[] args = {"-help"};
     rmAdminCLI.run(args);

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/resources/federation-weights.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+<federationWeights>
+    <weight>
+        <queue>
+            <name>root.a</name>
+            <amrmPolicyWeights>
+                <subClusterIdInfo>
+                    <id>SC-1</id>
+                    <weight>0.7</weight>
+                </subClusterIdInfo>
+                <subClusterIdInfo>
+                    <id>SC-2</id>
+                    <weight>0.3</weight>
+                </subClusterIdInfo>
+            </amrmPolicyWeights>
+            <routerPolicyWeights>
+                <subClusterIdInfo>
+                    <id>SC-1</id>
+                    <weight>0.6</weight>
+                </subClusterIdInfo>
+                <subClusterIdInfo>
+                    <id>SC-2</id>
+                    <weight>0.4</weight>
+                </subClusterIdInfo>
+            </routerPolicyWeights>
+            <headroomAlpha>1.0</headroomAlpha>
+        </queue>
+    </weight>
+</federationWeights>