diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java index 4aa3a14..89ae30e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java @@ -234,21 +234,22 @@ private static void printHelp(String cmd, boolean isHAEnabled) { summary.append("rmadmin is the command to execute YARN administrative " + "commands.\n"); summary.append("The full syntax is: \n\n" + - "yarn rmadmin" + - " [-refreshQueues]" + - " [-refreshNodes [-g [timeout in seconds] -client|server]]" + - " [-refreshNodesResources]" + - " [-refreshSuperUserGroupsConfiguration]" + - " [-refreshUserToGroupsMappings]" + - " [-refreshAdminAcls]" + - " [-refreshServiceAcl]" + - " [-getGroup [username]]" + - " [-addToClusterNodeLabels <\"label1(exclusive=true)," - + "label2(exclusive=false),label3\">]" + - " [-removeFromClusterNodeLabels ]" + - " [-replaceLabelsOnNode <\"node1[:port]=label1,label2 node2[:port]=label1\">]" + - " [-directlyAccessNodeLabelStore]" + - " [-updateNodeResource [NodeID] [MemSize] [vCores] ([OvercommitTimeout])"); + "yarn rmadmin" + + " [-refreshQueues]" + + " [-refreshNodes [-g [timeout in seconds] -client|server]]" + + " [-refreshNodesResources]" + + " [-refreshSuperUserGroupsConfiguration]" + + " [-refreshUserToGroupsMappings]" + + " [-refreshAdminAcls]" + + " [-refreshServiceAcl]" + + " [-getGroup [username]]" + + " [-addToClusterNodeLabels <\"label1(exclusive=true)," + + "label2(exclusive=false),label3\">]" + + " [-removeFromClusterNodeLabels ]" + + " [-replaceLabelsOnNode <\"node1[:port]=label1,label2 node2[:port]=label1\">]" + + " [-directlyAccessNodeLabelStore]" + + " [-refreshClusterMaxPriority]" + + " [-updateNodeResource [NodeID] [MemSize] [vCores] ([OvercommitTimeout])"); if (isHAEnabled) { appendHAUsage(summary); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java index d3161ba..656380d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java @@ -474,9 +474,9 @@ public void testHelp() throws Exception { "[-removeFromClusterNodeLabels ] " + "[-replaceLabelsOnNode " + "<\"node1[:port]=label1,label2 node2[:port]=label1\">] " + - "[-directlyAccessNodeLabelStore] [-updateNodeResource " + - "[NodeID] [MemSize] [vCores] ([OvercommitTimeout]) " + - "[-help [cmd]]")); + "[-directlyAccessNodeLabelStore] [-refreshClusterMaxPriority] " + + "[-updateNodeResource [NodeID] [MemSize] [vCores] " + + "([OvercommitTimeout]) [-help [cmd]]")); assertTrue(dataOut .toString() .contains( @@ -567,8 +567,8 @@ public void testHelp() throws Exception { + "label2(exclusive=false),label3\">]" + " [-removeFromClusterNodeLabels ] [-replaceLabelsOnNode " + "<\"node1[:port]=label1,label2 node2[:port]=label1\">] [-directlyAccessNodeLabelStore] " - + "[-updateNodeResource [NodeID] [MemSize] [vCores] ([OvercommitTimeout]) " - + "[-transitionToActive [--forceactive] ] " + + "[-refreshClusterMaxPriority] [-updateNodeResource [NodeID] [MemSize] [vCores] " + + "([OvercommitTimeout]) [-transitionToActive [--forceactive] ] " + "[-transitionToStandby ] " + "[-getServiceState ] [-checkHealth ] [-help [cmd]]"; String actualHelpMsg = dataOut.toString();