This is an automated email from the ASF dual-hosted git repository.
aajisaka 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 5db7c49 YARN-9162. Fix TestRMAdminCLI#testHelp. Contributed by Ayush
Saxena.
5db7c49 is described below
commit 5db7c4906235dd1070b9706ca4971f1eb5d74139
Author: Akira Ajisaka <[email protected]>
AuthorDate: Mon Jan 7 17:32:28 2019 +0900
YARN-9162. Fix TestRMAdminCLI#testHelp. Contributed by Ayush Saxena.
---
.../src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java | 6 ++++--
1 file changed, 4 insertions(+), 2 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 068eaa8..356a8ce 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
@@ -187,7 +187,8 @@ public class RMAdminCLI extends HAAdmin {
private static void appendHAUsage(final StringBuilder usageBuilder) {
for (Map.Entry<String,UsageInfo> cmdEntry : USAGE.entrySet()) {
if (cmdEntry.getKey().equals("-help")
- || cmdEntry.getKey().equals("-failover")) {
+ || cmdEntry.getKey().equals("-failover")
+ || cmdEntry.getKey().equals("-transitionToObserver")) {
continue;
}
UsageInfo usageInfo = cmdEntry.getValue();
@@ -302,7 +303,8 @@ public class RMAdminCLI extends HAAdmin {
}
if (isHAEnabled) {
for (String cmdKey : USAGE.keySet()) {
- if (!cmdKey.equals("-help") && !cmdKey.equals("-failover")) {
+ if (!cmdKey.equals("-help") && !cmdKey.equals("-failover")
+ && !cmdKey.equals("-transitionToObserver")) {
buildHelpMsg(cmdKey, helpBuilder);
helpBuilder.append("\n");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
