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 iv...@apache.org on 2014/10/20 05:49:07 UTC
git commit: Revert "MAPREDUCE-5911. Terasort TeraOutputFormat does
not check for output directory existance. Contributed by Bruno P. Kinoshita."
Repository: hadoop
Updated Branches:
refs/heads/branch-2.6 71e05b190 -> a78dd99d6
Revert "MAPREDUCE-5911. Terasort TeraOutputFormat does not check for output directory existance. Contributed by Bruno P. Kinoshita."
This reverts commit 71e05b190050aac2fa8ed6d7d6ad023a275c0f1e.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a78dd99d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a78dd99d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a78dd99d
Branch: refs/heads/branch-2.6
Commit: a78dd99d67549fca200452cafcf7e3a6935402f3
Parents: 71e05b1
Author: Ivan Mitic <iv...@apache.org>
Authored: Sun Oct 19 23:43:38 2014 -0400
Committer: Ivan Mitic <iv...@apache.org>
Committed: Sun Oct 19 23:43:38 2014 -0400
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 3 ---
.../org/apache/hadoop/examples/terasort/TeraOutputFormat.java | 6 ------
2 files changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a78dd99d/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index b82b097..b7f7606 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -204,9 +204,6 @@ Release 2.6.0 - UNRELEASED
MAPREDUCE-5542. Killing a job just as it finishes can generate an NPE in
client (Rohith via jlowe)
- MAPREDUCE-5911. Terasort TeraOutputFormat does not check for output
- directory existance (Bruno P. Kinoshita via ivanmi)
-
Release 2.5.1 - 2014-09-05
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a78dd99d/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraOutputFormat.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraOutputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraOutputFormat.java
index ab43d25..a4a67fb 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraOutputFormat.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraOutputFormat.java
@@ -24,7 +24,6 @@ import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
-import org.apache.hadoop.mapred.FileAlreadyExistsException;
import org.apache.hadoop.mapred.InvalidJobConfException;
import org.apache.hadoop.mapreduce.JobContext;
import org.apache.hadoop.mapreduce.OutputCommitter;
@@ -91,11 +90,6 @@ public class TeraOutputFormat extends FileOutputFormat<Text,Text> {
// get delegation token for outDir's file system
TokenCache.obtainTokensForNamenodes(job.getCredentials(),
new Path[] { outDir }, job.getConfiguration());
-
- if (outDir.getFileSystem(job.getConfiguration()).exists(outDir)) {
- throw new FileAlreadyExistsException("Output directory " + outDir +
- " already exists");
- }
}
public RecordWriter<Text,Text> getRecordWriter(TaskAttemptContext job