diff --git hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java index f72df77..e563c5e 100644 --- hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java +++ hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java @@ -125,12 +125,12 @@ protected void printUsage(PrintStream errOut) { ToolRunner.printGenericCommandUsage(errOut); } - private static void printUsage(PrintStream errOut, String cmd) { + private void printUsage(PrintStream errOut, String cmd) { UsageInfo usage = USAGE.get(cmd); if (usage == null) { throw new RuntimeException("No usage for cmd " + cmd); } - errOut.println("Usage: HAAdmin [" + cmd + " " + usage.args + "]"); + errOut.println(getUsageString()+" [" + cmd + " " + usage.args + "]"); } private int transitionToActive(final CommandLine cmd) diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java index 6f1bbd0..eed4c17 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java @@ -632,6 +632,11 @@ protected HAServiceTarget resolveTarget(String rmId) { "Could not connect to RM HA Admin for node " + rmId); } } + + @Override + protected String getUsageString() { + return "Usage: rmadmin"; + } public static void main(String[] args) throws Exception { int result = ToolRunner.run(new RMAdminCLI(), args);