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 pr...@apache.org on 2020/07/27 06:57:58 UTC
[hadoop] branch trunk updated: YARN-10366. Fix Yarn rmadmin help
message shows two labels for one node for --replaceLabelsOnNode.
This is an automated email from the ASF dual-hosted git repository.
prabhujoseph pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 60a2546 YARN-10366. Fix Yarn rmadmin help message shows two labels for one node for --replaceLabelsOnNode.
60a2546 is described below
commit 60a254621a3d07a6c3c4611ea86cffd9625e8fb2
Author: Prabhu Joseph <pr...@apache.org>
AuthorDate: Fri Jul 24 16:59:15 2020 +0530
YARN-10366. Fix Yarn rmadmin help message shows two labels for one node for --replaceLabelsOnNode.
Contributed by Tanu Ajmera.
---
.../src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java | 4 ++--
.../test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
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 489509b..69fd117 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
@@ -140,7 +140,7 @@ public class RMAdminCLI extends HAAdmin {
"remove from cluster node labels"))
.put("-replaceLabelsOnNode",
new UsageInfo(
- "<\"node1[:port]=label1,label2 node2[:port]=label1,label2\"> "
+ "<\"node1[:port]=label1 node2[:port]=label2\"> "
+ "[-failOnUnknownNodes] ",
"replace labels on nodes"
+ " (please note that we do not support specifying multiple"
@@ -280,7 +280,7 @@ public class RMAdminCLI extends HAAdmin {
+ "label2(exclusive=false),label3\">]"
+ " [-removeFromClusterNodeLabels <label1,label2,label3>]"
+ " [-replaceLabelsOnNode "
- + "<\"node1[:port]=label1,label2 node2[:port]=label1\"> "
+ + "<\"node1[:port]=label1 node2[:port]=label2\"> "
+ "[-failOnUnknownNodes]]"
+ " [-directlyAccessNodeLabelStore]"
+ " [-refreshClusterMaxPriority]"
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 40b393f..e0b0041 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
@@ -703,7 +703,7 @@ public class TestRMAdminCLI {
"<\"label1(exclusive=true),label2(exclusive=false),label3\">] " +
"[-removeFromClusterNodeLabels <label1,label2,label3>] " +
"[-replaceLabelsOnNode " +
- "<\"node1[:port]=label1,label2 node2[:port]=label1\"> " +
+ "<\"node1[:port]=label1 node2[:port]=label2\"> " +
"[-failOnUnknownNodes]] " +
"[-directlyAccessNodeLabelStore] [-refreshClusterMaxPriority] " +
"[-updateNodeResource [NodeID] [MemSize] [vCores] "
@@ -795,7 +795,7 @@ public class TestRMAdminCLI {
+ " [username]] [-addToClusterNodeLabels <\"label1(exclusive=true),"
+ "label2(exclusive=false),label3\">]"
+ " [-removeFromClusterNodeLabels <label1,label2,label3>] [-replaceLabelsOnNode "
- + "<\"node1[:port]=label1,label2 node2[:port]=label1\"> "
+ + "<\"node1[:port]=label1 node2[:port]=label2\"> "
+ "[-failOnUnknownNodes]] [-directlyAccessNodeLabelStore] "
+ "[-refreshClusterMaxPriority] "
+ "[-updateNodeResource [NodeID] [MemSize] [vCores] "
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org