Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F3113184C6 for ; Fri, 9 Oct 2015 02:06:08 +0000 (UTC) Received: (qmail 41865 invoked by uid 500); 9 Oct 2015 02:06:08 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 41805 invoked by uid 500); 9 Oct 2015 02:06:08 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 41796 invoked by uid 99); 9 Oct 2015 02:06:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Oct 2015 02:06:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 92FB7E0C54; Fri, 9 Oct 2015 02:06:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aajisaka@apache.org To: common-commits@hadoop.apache.org Message-Id: <7232b8d4031f47c8be2ff5a9bbb23eac@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: MAPREDUCE-6479. Add missing mapred job command options in mapreduce document. Contributed by nijel. Date: Fri, 9 Oct 2015 02:06:08 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 ec74b0cd4 -> 22ff37f5c MAPREDUCE-6479. Add missing mapred job command options in mapreduce document. Contributed by nijel. (cherry picked from commit 584cf3bb35b96749f711b9e7145cf3fb71897cd9) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/22ff37f5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/22ff37f5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/22ff37f5 Branch: refs/heads/branch-2 Commit: 22ff37f5ce58fa86507b4ead4c0c72c1e1fa5535 Parents: ec74b0c Author: Akira Ajisaka Authored: Fri Oct 9 10:54:12 2015 +0900 Committer: Akira Ajisaka Committed: Fri Oct 9 10:58:15 2015 +0900 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java | 2 +- .../src/site/markdown/MapredCommands.md | 6 +++++- 3 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/22ff37f5/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index fb2400c..e952be3 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -124,6 +124,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12428. Fix inconsistency between log-level guards and statements. (Jagadesh Kiran N and Jackie Chang via ozawa) + MAPREDUCE-6479. Add missing mapred job command options in mapreduce + document. (nijel via aajisaka) + OPTIMIZATIONS MAPREDUCE-6376. Add avro binary support for jhist files (Ray Chiang via http://git-wip-us.apache.org/repos/asf/hadoop/blob/22ff37f5/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 fb36e1a..2e185cb 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 @@ -423,7 +423,7 @@ public class CLI extends Configured implements Tool { private void displayUsage(String cmd) { String prefix = "Usage: job "; String jobPriorityValues = getJobPriorityNames(); - String taskStates = "running, completed"; + String taskStates = "pending, running, completed, failed, killed"; if ("-submit".equals(cmd)) { System.err.println(prefix + "[" + cmd + " ]"); http://git-wip-us.apache.org/repos/asf/hadoop/blob/22ff37f5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapredCommands.md ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapredCommands.md b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapredCommands.md index 31c2723..1fba481 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapredCommands.md +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapredCommands.md @@ -74,7 +74,7 @@ Copy file or directories recursively. More information can be found at Command to interact with Map Reduce Jobs. -Usage: `mapred job | [GENERIC_OPTIONS] | [-submit ] | [-status ] | [-counter ] | [-kill ] | [-events <#-of-events>] | [-history [all] ] | [-list [all]] | [-kill-task ] | [-fail-task ] | [-set-priority ]` +Usage: `mapred job | [GENERIC_OPTIONS] | [-submit ] | [-status ] | [-counter ] | [-kill ] | [-events <#-of-events>] | [-history [all] ] | [-list [all]] | [-kill-task ] | [-fail-task ] | [-set-priority ] | [-list-active-trackers] | [-list-blacklisted-trackers] | [-list-attempt-ids ] [-logs ]` | COMMAND\_OPTION | Description | |:---- |:---- | @@ -88,6 +88,10 @@ Usage: `mapred job | [GENERIC_OPTIONS] | [-submit ] | [-status