diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index ce165101bf..b0367a7dd1 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -256,6 +256,9 @@ Release 2.8.0 - UNRELEASED IMPROVEMENTS + MAPREDUCE-6291. Correct mapred queue usage command. + (Brahma Reddu Battula via harsh) + MAPREDUCE-579. Streaming "slowmatch" documentation. (harsh) MAPREDUCE-6287. Deprecated methods in org.apache.hadoop.examples.Sort diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobQueueClient.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobQueueClient.java index 097e338a92..81f6140124 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobQueueClient.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobQueueClient.java @@ -224,7 +224,7 @@ private void displayQueueAclsInfoForCurrentUser() throws IOException { } private void displayUsage(String cmd) { - String prefix = "Usage: JobQueueClient "; + String prefix = "Usage: queue "; if ("-queueinfo".equals(cmd)) { System.err.println(prefix + "[" + cmd + " [-showJobs]]"); } else { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/pipes/Submitter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/pipes/Submitter.java index 8f4259e3ec..4f5b6a1c9c 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/pipes/Submitter.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/pipes/Submitter.java @@ -363,7 +363,7 @@ Parser createParser() { void printUsage() { // The CLI package should do this for us, but I can't figure out how // to make it print something reasonable. - System.out.println("bin/hadoop pipes"); + System.out.println("Usage: pipes "); System.out.println(" [-input ] // Input directory"); System.out.println(" [-output ] // Output directory"); System.out.println(" [-jar // jar filename"); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java index c3f15646f4..a350829c93 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java @@ -421,7 +421,7 @@ private String getTaskTypes() { * Display usage of the command-line tool and terminate execution. */ private void displayUsage(String cmd) { - String prefix = "Usage: CLI "; + String prefix = "Usage: job "; String jobPriorityValues = getJobPriorityNames(); String taskStates = "running, completed"; diff --git a/hadoop-tools/hadoop-archives/src/main/java/org/apache/hadoop/tools/HadoopArchives.java b/hadoop-tools/hadoop-archives/src/main/java/org/apache/hadoop/tools/HadoopArchives.java index 18cd972af4..c5c42b1425 100644 --- a/hadoop-tools/hadoop-archives/src/main/java/org/apache/hadoop/tools/HadoopArchives.java +++ b/hadoop-tools/hadoop-archives/src/main/java/org/apache/hadoop/tools/HadoopArchives.java @@ -101,7 +101,7 @@ public class HadoopArchives implements Tool { /** the desired replication degree; default is 10 **/ short repl = 10; - private static final String usage = "archive" + private static final String usage = "Usage: archive" + " -archiveName .har -p [-r ]" + "* " + "\n";