Sfoglia il codice sorgente

YARN-10366. Fix Yarn rmadmin help message shows two labels for one node for --replaceLabelsOnNode.

Contributed by Tanu Ajmera.
Prabhu Joseph 4 anni fa
parent
commit
60a254621a

+ 2 - 2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java

@@ -140,7 +140,7 @@ public class RMAdminCLI extends HAAdmin {
                   "remove from cluster node labels"))
                   "remove from cluster node labels"))
           .put("-replaceLabelsOnNode",
           .put("-replaceLabelsOnNode",
               new UsageInfo(
               new UsageInfo(
-                  "<\"node1[:port]=label1,label2 node2[:port]=label1,label2\"> "
+                  "<\"node1[:port]=label1 node2[:port]=label2\"> "
                   + "[-failOnUnknownNodes] ",
                   + "[-failOnUnknownNodes] ",
               "replace labels on nodes"
               "replace labels on nodes"
                   + " (please note that we do not support specifying multiple"
                   + " (please note that we do not support specifying multiple"
@@ -280,7 +280,7 @@ public class RMAdminCLI extends HAAdmin {
         + "label2(exclusive=false),label3\">]"
         + "label2(exclusive=false),label3\">]"
         + " [-removeFromClusterNodeLabels <label1,label2,label3>]"
         + " [-removeFromClusterNodeLabels <label1,label2,label3>]"
         + " [-replaceLabelsOnNode "
         + " [-replaceLabelsOnNode "
-        + "<\"node1[:port]=label1,label2 node2[:port]=label1\"> "
+        + "<\"node1[:port]=label1 node2[:port]=label2\"> "
         + "[-failOnUnknownNodes]]"
         + "[-failOnUnknownNodes]]"
         + " [-directlyAccessNodeLabelStore]"
         + " [-directlyAccessNodeLabelStore]"
         + " [-refreshClusterMaxPriority]"
         + " [-refreshClusterMaxPriority]"

+ 2 - 2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java

@@ -703,7 +703,7 @@ public class TestRMAdminCLI {
               "<\"label1(exclusive=true),label2(exclusive=false),label3\">] " +
               "<\"label1(exclusive=true),label2(exclusive=false),label3\">] " +
               "[-removeFromClusterNodeLabels <label1,label2,label3>] " +
               "[-removeFromClusterNodeLabels <label1,label2,label3>] " +
               "[-replaceLabelsOnNode " +
               "[-replaceLabelsOnNode " +
-              "<\"node1[:port]=label1,label2 node2[:port]=label1\"> " +
+              "<\"node1[:port]=label1 node2[:port]=label2\"> " +
               "[-failOnUnknownNodes]] " +
               "[-failOnUnknownNodes]] " +
               "[-directlyAccessNodeLabelStore] [-refreshClusterMaxPriority] " +
               "[-directlyAccessNodeLabelStore] [-refreshClusterMaxPriority] " +
               "[-updateNodeResource [NodeID] [MemSize] [vCores] "
               "[-updateNodeResource [NodeID] [MemSize] [vCores] "
@@ -795,7 +795,7 @@ public class TestRMAdminCLI {
               + " [username]] [-addToClusterNodeLabels <\"label1(exclusive=true),"
               + " [username]] [-addToClusterNodeLabels <\"label1(exclusive=true),"
                   + "label2(exclusive=false),label3\">]"
                   + "label2(exclusive=false),label3\">]"
               + " [-removeFromClusterNodeLabels <label1,label2,label3>] [-replaceLabelsOnNode "
               + " [-removeFromClusterNodeLabels <label1,label2,label3>] [-replaceLabelsOnNode "
-              + "<\"node1[:port]=label1,label2 node2[:port]=label1\"> "
+              + "<\"node1[:port]=label1 node2[:port]=label2\"> "
               + "[-failOnUnknownNodes]] [-directlyAccessNodeLabelStore] "
               + "[-failOnUnknownNodes]] [-directlyAccessNodeLabelStore] "
               + "[-refreshClusterMaxPriority] "
               + "[-refreshClusterMaxPriority] "
               + "[-updateNodeResource [NodeID] [MemSize] [vCores] "
               + "[-updateNodeResource [NodeID] [MemSize] [vCores] "