Author: acmurthy
Date: Thu Jul 24 15:52:14 2008
New Revision: 679603
URL: http://svn.apache.org/viewvc?rev=679603&view=rev
Log:
Merge -r 679600:679601 from trunk to branch-0.18 to fix HADOOP-3813
Modified:
hadoop/core/branches/branch-0.18/CHANGES.txt
hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=679603&r1=679602&r2=679603&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Thu Jul 24 15:52:14 2008
@@ -799,6 +799,10 @@
HADOOP-3370. Ensure that the TaskTracker.runningJobs data-structure is
correctly cleaned-up on task completion. (Zheng Shao via acmurthy)
+ HADOOP-3813. Fix task-output clean-up on HDFS to use the recursive
+ FileSystem.delete rather than the FileUtil.fullyDelete. (Amareshwari
+ Sri Ramadasu via acmurthy)
+
Release 0.17.1 - 2008-06-23
INCOMPATIBLE CHANGES
Modified:
hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/JobInProgress.java?rev=679603&r1=679602&r2=679603&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
(original)
+++
hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
Thu Jul 24 15:52:14 2008
@@ -34,7 +34,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.fs.LocalFileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.JobHistory.Values;
@@ -1657,7 +1656,7 @@
Path tmpDir = new Path(outputPath, MRConstants.TEMP_DIR_NAME);
FileSystem fileSys = tmpDir.getFileSystem(conf);
if (fileSys.exists(tmpDir)) {
- FileUtil.fullyDelete(fileSys, tmpDir);
+ fileSys.delete(tmpDir, true);
}
}
} catch (IOException e) {
