From 5db7c4906235dd1070b9706ca4971f1eb5d74139 Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Mon, 7 Jan 2019 17:32:28 +0900 Subject: [PATCH] YARN-9162. Fix TestRMAdminCLI#testHelp. Contributed by Ayush Saxena. --- .../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 068eaa8de27..356a8cea1ae 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 @@ protected void setOut(PrintStream out) { private static void appendHAUsage(final StringBuilder usageBuilder) { for (Map.Entry 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 @@ private static void printHelp(String cmd, boolean isHAEnabled) { } 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"); }