Repository: hadoop Updated Branches: refs/heads/trunk 89fb0f57e -> 27d49e671
MAPREDUCE-6291. Correct mapred queue usage command. Contributed by Brahma Reddy Battula. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/27d49e67 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/27d49e67 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/27d49e67 Branch: refs/heads/trunk Commit: 27d49e6714ad7fc6038bc001e70ff5be3755f1ef Parents: 89fb0f5 Author: Harsh J <ha...@cloudera.com> Authored: Sat Mar 28 11:57:21 2015 +0530 Committer: Harsh J <ha...@cloudera.com> Committed: Sat Mar 28 11:58:17 2015 +0530 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/mapred/JobQueueClient.java | 2 +- .../src/main/java/org/apache/hadoop/mapred/pipes/Submitter.java | 2 +- .../src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java | 2 +- .../src/main/java/org/apache/hadoop/tools/HadoopArchives.java | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/27d49e67/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index ce16510..b0367a7 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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/27d49e67/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobQueueClient.java ---------------------------------------------------------------------- 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 097e338..81f6140 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 @@ class JobQueueClient extends Configured implements Tool { } private void displayUsage(String cmd) { - String prefix = "Usage: JobQueueClient "; + String prefix = "Usage: queue "; if ("-queueinfo".equals(cmd)) { System.err.println(prefix + "[" + cmd + "<job-queue-name> [-showJobs]]"); } else { http://git-wip-us.apache.org/repos/asf/hadoop/blob/27d49e67/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/pipes/Submitter.java ---------------------------------------------------------------------- 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 8f4259e..4f5b6a1 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 @@ public class Submitter extends Configured implements Tool { 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 <path>] // Input directory"); System.out.println(" [-output <path>] // Output directory"); System.out.println(" [-jar <jar file> // jar filename"); http://git-wip-us.apache.org/repos/asf/hadoop/blob/27d49e67/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java ---------------------------------------------------------------------- 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 c3f1564..a350829 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 @@ public class CLI extends Configured implements Tool { * 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"; http://git-wip-us.apache.org/repos/asf/hadoop/blob/27d49e67/hadoop-tools/hadoop-archives/src/main/java/org/apache/hadoop/tools/HadoopArchives.java ---------------------------------------------------------------------- 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 18cd972..c5c42b1 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 <NAME>.har -p <parent path> [-r <replication factor>]" + "<src>* <dest>" + "\n";