Repository: hadoop Updated Branches: refs/heads/branch-2 71c60af84 -> 57172c09e
MAPREDUCE-6231. Grep example job is not working on a fully-distributed cluster. (aajisaka) (cherry picked from commit fe2188a0420f501ccfcba92e91d4b564ba86103e) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/57172c09 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/57172c09 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/57172c09 Branch: refs/heads/branch-2 Commit: 57172c09e21263d550775b8e50081981fa806f32 Parents: 71c60af Author: Akira Ajisaka <aajis...@apache.org> Authored: Fri Jan 30 01:10:02 2015 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Fri Jan 30 01:11:22 2015 +0900 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/examples/Grep.java | 2 ++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/57172c09/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 0eced62..d7ee8fb 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -85,6 +85,9 @@ Release 2.7.0 - UNRELEASED MAPREDUCE-6230. Fixed RMContainerAllocator to update the new AMRMToken service name properly. (Jason Lowe via jianhe) + MAPREDUCE-6231. Grep example job is not working on a fully-distributed + cluster. (aajisaka) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/57172c09/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/Grep.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/Grep.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/Grep.java index 421afcd..810d0dd 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/Grep.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/Grep.java @@ -61,6 +61,7 @@ public class Grep extends Configured implements Tool { try { grepJob.setJobName("grep-search"); + grepJob.setJarByClass(Grep.class); FileInputFormat.setInputPaths(grepJob, args[0]); @@ -78,6 +79,7 @@ public class Grep extends Configured implements Tool { Job sortJob = new Job(conf); sortJob.setJobName("grep-sort"); + sortJob.setJarByClass(Grep.class); FileInputFormat.setInputPaths(sortJob, tempDir); sortJob.setInputFormatClass(SequenceFileInputFormat.class);
