Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-5631. Missing refreshClusterMaxPriority usage in rmadmin help message. Contributed by Kai Sasaki.

This commit is contained in:
Rohith Sharma K S 2016-09-27 23:07:43 +05:30
parent 3f5482bb69
commit 4f6facb90d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java
View File

@ -248,6 +248,7 @@ public class RMAdminCLI extends HAAdmin {
" [-removeFromClusterNodeLabels <label1,label2,label3>]" + " [-removeFromClusterNodeLabels <label1,label2,label3>]" +
" [-replaceLabelsOnNode <\"node1[:port]=label1,label2 node2[:port]=label1\">]" + " [-replaceLabelsOnNode <\"node1[:port]=label1,label2 node2[:port]=label1\">]" +
" [-directlyAccessNodeLabelStore]" + " [-directlyAccessNodeLabelStore]" +
" [-refreshClusterMaxPriority]" +
" [-updateNodeResource [NodeID] [MemSize] [vCores] ([OvercommitTimeout])"); " [-updateNodeResource [NodeID] [MemSize] [vCores] ([OvercommitTimeout])");
if (isHAEnabled) { if (isHAEnabled) {
appendHAUsage(summary); appendHAUsage(summary);

10
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java
View File

@ -474,9 +474,9 @@ public class TestRMAdminCLI {
"[-removeFromClusterNodeLabels <label1,label2,label3>] " + "[-removeFromClusterNodeLabels <label1,label2,label3>] " +
"[-replaceLabelsOnNode " + "[-replaceLabelsOnNode " +
"<\"node1[:port]=label1,label2 node2[:port]=label1\">] " + "<\"node1[:port]=label1,label2 node2[:port]=label1\">] " +
"[-directlyAccessNodeLabelStore] [-updateNodeResource " + "[-directlyAccessNodeLabelStore] [-refreshClusterMaxPriority] " +
"[NodeID] [MemSize] [vCores] ([OvercommitTimeout]) " + "[-updateNodeResource [NodeID] [MemSize] [vCores] " +
"[-help [cmd]]")); "([OvercommitTimeout]) [-help [cmd]]"));
assertTrue(dataOut assertTrue(dataOut
.toString() .toString()
.contains( .contains(
@ -567,8 +567,8 @@ public class TestRMAdminCLI {
+ "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\">] [-directlyAccessNodeLabelStore] " + "<\"node1[:port]=label1,label2 node2[:port]=label1\">] [-directlyAccessNodeLabelStore] "
+ "[-updateNodeResource [NodeID] [MemSize] [vCores] ([OvercommitTimeout]) " + "[-refreshClusterMaxPriority] [-updateNodeResource [NodeID] [MemSize] [vCores] "
+ "[-transitionToActive [--forceactive] <serviceId>] " + "([OvercommitTimeout]) [-transitionToActive [--forceactive] <serviceId>] "
+ "[-transitionToStandby <serviceId>] " + "[-transitionToStandby <serviceId>] "
+ "[-getServiceState <serviceId>] [-checkHealth <serviceId>] [-help [cmd]]"; + "[-getServiceState <serviceId>] [-checkHealth <serviceId>] [-help [cmd]]";
String actualHelpMsg = dataOut.toString(); String actualHelpMsg = dataOut.toString();