You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zh...@apache.org on 2015/01/29 19:06:15 UTC

[32/34] hadoop git commit: MAPREDUCE-6231. Grep example job is not working on a fully-distributed cluster. (aajisaka)

MAPREDUCE-6231. Grep example job is not working on a fully-distributed cluster. (aajisaka)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dd72a41a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dd72a41a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dd72a41a

Branch: refs/heads/HDFS-EC
Commit: dd72a41ae7e83c3797119e1365b69d5598ceedde
Parents: 899b5e1
Author: Akira Ajisaka <aa...@apache.org>
Authored: Fri Jan 30 01:10:02 2015 +0900
Committer: Zhe Zhang <zh...@apache.org>
Committed: Thu Jan 29 10:05:27 2015 -0800

----------------------------------------------------------------------
 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/dd72a41a/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index b576c29..39ff8cc 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -317,6 +317,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/dd72a41a/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);