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

YARN-4534. Remove the redundant symbol in yarn rmadmin help msg. Contributed by Lin Yiqun.

This commit is contained in:
Akira Ajisaka 2016-01-14 13:59:39 +09:00
parent 7b0964f354
commit 62b0d61513
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -1246,6 +1246,9 @@ Release 2.8.0 - UNRELEASED
YARN-4479. Change CS LeafQueue pendingOrderingPolicy to hornor recovered apps. YARN-4479. Change CS LeafQueue pendingOrderingPolicy to hornor recovered apps.
(Rohith Sharma K S via jianhe) (Rohith Sharma K S via jianhe)
YARN-4534. Remove the redundant symbol in yarn rmadmin help msg.
(Lin Yiqun via aajisaka)
Release 2.7.3 - UNRELEASED Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

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

@ -241,7 +241,7 @@ public class RMAdminCLI extends HAAdmin {
+ "label2(exclusive=false),label3\">]" + + "label2(exclusive=false),label3\">]" +
" [-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]" +
" [-updateNodeResource [NodeID] [MemSize] [vCores] ([OvercommitTimeout])"); " [-updateNodeResource [NodeID] [MemSize] [vCores] ([OvercommitTimeout])");
if (isHAEnabled) { if (isHAEnabled) {
appendHAUsage(summary); appendHAUsage(summary);

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

@ -397,7 +397,7 @@ 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] [-updateNodeResource " +
"[NodeID] [MemSize] [vCores] ([OvercommitTimeout]) " + "[NodeID] [MemSize] [vCores] ([OvercommitTimeout]) " +
"[-help [cmd]]")); "[-help [cmd]]"));
assertTrue(dataOut assertTrue(dataOut
@ -487,7 +487,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\">] [-directlyAccessNodeLabelStore]] " + "<\"node1[:port]=label1,label2 node2[:port]=label1\">] [-directlyAccessNodeLabelStore] "
+ "[-updateNodeResource [NodeID] [MemSize] [vCores] ([OvercommitTimeout]) " + "[-updateNodeResource [NodeID] [MemSize] [vCores] ([OvercommitTimeout]) "
+ "[-transitionToActive [--forceactive] <serviceId>] " + "[-transitionToActive [--forceactive] <serviceId>] "
+ "[-transitionToStandby <serviceId>] " + "[-transitionToStandby <serviceId>] "