Author: sharad
Date: Thu Jul 2 10:51:03 2009
New Revision: 790544
URL: http://svn.apache.org/viewvc?rev=790544&view=rev
Log:
MAPREDUCE-124. Fix a bug in failure handling of abort task of OutputCommiter.
Contributed by Amareshwari Sriramadasu.
Modified:
hadoop/common/branches/branch-0.20/CHANGES.txt
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Task.java
hadoop/common/branches/branch-0.20/src/test/org/apache/hadoop/mapred/TestTaskFail.java
Modified: hadoop/common/branches/branch-0.20/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/CHANGES.txt?rev=790544&r1=790543&r2=790544&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20/CHANGES.txt Thu Jul 2 10:51:03 2009
@@ -161,6 +161,9 @@
MAPREDUCE-179. Update progress in new RecordReaders. (cdouglas)
+ MAPREDUCE-124. Fix a bug in failure handling of abort task of
+ OutputCommiter. (Amareshwari Sriramadasu via sharad)
+
Release 0.20.0 - 2009-04-15
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Task.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Task.java?rev=790544&r1=790543&r2=790544&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Task.java
(original)
+++
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Task.java
Thu Jul 2 10:51:03 2009
@@ -790,7 +790,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/common/branches/branch-0.20/src/test/org/apache/hadoop/mapred/TestTaskFail.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/test/org/apache/hadoop/mapred/TestTaskFail.java?rev=790544&r1=790543&r2=790544&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20/src/test/org/apache/hadoop/mapred/TestTaskFail.java
(original)
+++
hadoop/common/branches/branch-0.20/src/test/org/apache/hadoop/mapred/TestTaskFail.java
Thu Jul 2 10:51:03 2009
@@ -96,6 +96,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",
