You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ro...@apache.org on 2016/09/13 09:55:37 UTC
hadoop git commit: YARN-5631. Missing refreshClusterMaxPriority usage
in rmadmin help message. Contributed by Kai Sasaki.
Repository: hadoop
Updated Branches:
refs/heads/trunk f0876b8b6 -> 729de3e6b
YARN-5631. Missing refreshClusterMaxPriority usage in rmadmin help message. Contributed by Kai Sasaki.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/729de3e6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/729de3e6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/729de3e6
Branch: refs/heads/trunk
Commit: 729de3e6b6ae1fcfe1c6bec7102d758ad489df47
Parents: f0876b8
Author: Rohith Sharma K S <ro...@apache.org>
Authored: Tue Sep 13 15:23:24 2016 +0530
Committer: Rohith Sharma K S <ro...@apache.org>
Committed: Tue Sep 13 15:23:24 2016 +0530
----------------------------------------------------------------------
.../org/apache/hadoop/yarn/client/cli/RMAdminCLI.java | 1 +
.../org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java | 10 ++++++----
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/729de3e6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java
----------------------------------------------------------------------
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 fcb9b74..7a898a1 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
@@ -249,6 +249,7 @@ public class RMAdminCLI extends HAAdmin {
" [-replaceLabelsOnNode <\"node1[:port]=label1,label2" +
" node2[:port]=label1\">]" +
" [-directlyAccessNodeLabelStore]" +
+ " [-refreshClusterMaxPriority]" +
" [-updateNodeResource [NodeID] [MemSize] [vCores]" +
" ([OvercommitTimeout])");
if (isHAEnabled) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/729de3e6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java
----------------------------------------------------------------------
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 60c7eac..bea6e39 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
@@ -471,9 +471,9 @@ public class TestRMAdminCLI {
"[-removeFromClusterNodeLabels <label1,label2,label3>] " +
"[-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(
@@ -565,7 +565,9 @@ public class TestRMAdminCLI {
+ "label2(exclusive=false),label3\">]"
+ " [-removeFromClusterNodeLabels <label1,label2,label3>] [-replaceLabelsOnNode "
+ "<\"node1[:port]=label1,label2 node2[:port]=label1\">] [-directlyAccessNodeLabelStore] "
- + "[-updateNodeResource [NodeID] [MemSize] [vCores] ([OvercommitTimeout]) "
+ + "[-refreshClusterMaxPriority] "
+ + "[-updateNodeResource [NodeID] [MemSize] [vCores] "
+ + "([OvercommitTimeout]) "
+ "[-transitionToActive [--forceactive] <serviceId>] "
+ "[-transitionToStandby <serviceId>] "
+ "[-getServiceState <serviceId>] [-checkHealth <serviceId>] [-help [cmd]]";
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org