You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by sh...@apache.org on 2009/07/02 12:46:20 UTC
svn commit: r790543 - in /hadoop/mapreduce/trunk: CHANGES.txt
src/java/org/apache/hadoop/mapred/Task.java
src/test/mapred/org/apache/hadoop/mapred/TestTaskFail.java
Author: sharad
Date: Thu Jul 2 10:46:20 2009
New Revision: 790543
URL: http://svn.apache.org/viewvc?rev=790543&view=rev
Log:
MAPREDUCE-124. Fix a bug in failure handling of abort task of OutputCommiter. Contributed by Amareshwari Sriramadasu.
Modified:
hadoop/mapreduce/trunk/CHANGES.txt
hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/Task.java
hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTaskFail.java
Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=790543&r1=790542&r2=790543&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Thu Jul 2 10:46:20 2009
@@ -83,3 +83,7 @@
build artifacts and config files. (cdouglas)
MAPREDUCE-433. Use more reliable counters in TestReduceFetch. (cdouglas)
+
+ MAPREDUCE-124. Fix a bug in failure handling of abort task of
+ OutputCommiter. (Amareshwari Sriramadasu via sharad)
+
Modified: hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/Task.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/Task.java?rev=790543&r1=790542&r2=790543&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/Task.java (original)
+++ hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/Task.java Thu Jul 2 10:46:20 2009
@@ -776,7 +776,7 @@
statusUpdate(umbilical);
LOG.info("Runnning cleanup for the task");
// do the cleanup
- discardOutput(taskContext);
+ committer.abortTask(taskContext);
}
protected void runJobCleanupTask(TaskUmbilicalProtocol umbilical,
Modified: hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTaskFail.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTaskFail.java?rev=790543&r1=790542&r2=790543&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTaskFail.java (original)
+++ hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTaskFail.java Thu Jul 2 10:46:20 2009
@@ -97,6 +97,7 @@
// configure the mapred Job
conf.setMapperClass(MapperClass.class);
conf.setReducerClass(IdentityReducer.class);
+ conf.setNumReduceTasks(0);
FileInputFormat.setInputPaths(conf, inDir);
FileOutputFormat.setOutputPath(conf, outDir);
String TEST_ROOT_DIR = new Path(System.getProperty("test.build.data",