svn commit: r1593894 - in /hadoop/common/branches/branch-0.22/mapreduce: CHANGES.txt src/java/org/apache/hadoop/mapreduce/util/MRAsyncDiskService.java

[ka...@apache.org]

Author: kasha
Date: Mon May 12 06:25:13 2014
New Revision: 1593894

URL: http://svn.apache.org/r1593894
Log:
MAPREDUCE-5706. toBeDeleted parent directories aren't being cleaned up. (Robert Kanter via kasha)

Modified:
    hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt
    hadoop/common/branches/branch-0.22/mapreduce/src/java/org/apache/hadoop/mapreduce/util/MRAsyncDiskService.java

Modified: hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt?rev=1593894&r1=1593893&r2=1593894&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt Mon May 12 06:25:13 2014
@@ -98,6 +98,9 @@ Release 0.22.1 - Unreleased
     MAPREDUCE-4360. Capacity Scheduler Hierarchical leaf queue does not honor
     the max capacity of container queue. (Mayank Bansal via shv)
 
+    MAPREDUCE-5706. toBeDeleted parent directories aren't being cleaned up.
+    (Robert Kanter via kasha)
+
 Release 0.22.0 - 2011-11-29
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-0.22/mapreduce/src/java/org/apache/hadoop/mapreduce/util/MRAsyncDiskService.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/mapreduce/src/java/org/apache/hadoop/mapreduce/util/MRAsyncDiskService.java?rev=1593894&r1=1593893&r2=1593894&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/mapreduce/src/java/org/apache/hadoop/mapreduce/util/MRAsyncDiskService.java (original)
+++ hadoop/common/branches/branch-0.22/mapreduce/src/java/org/apache/hadoop/mapreduce/util/MRAsyncDiskService.java Mon May 12 06:25:13 2014
@@ -315,7 +315,7 @@ public class MRAsyncDiskService {
     FileStatus status = localFileSystem.getFileStatus(target);
     
     if (shouldBeSecure) {
-      deletePathsInSecureCluster(newPathName, status);     
+      deletePathsInSecureCluster(target.toUri().getPath(), status);
     }else {
       DeleteTask task = new DeleteTask(volume, pathName, newPathName, 
           status.getOwner());
@@ -324,7 +324,7 @@ public class MRAsyncDiskService {
     return true;
   }
 
-  private void deletePathsInSecureCluster(String newPathName,
+  private void deletePathsInSecureCluster(String absPathName,
       FileStatus status) throws FileNotFoundException, IOException {
     // In a secure tasktracker, the subdirectories belong
     // to different user
@@ -338,15 +338,14 @@ public class MRAsyncDiskService {
         //add it to the cleanup queue
 
         item = new TaskController.DeletionContext(
-            taskController, false, owner, newPathName + Path.SEPARATOR_CHAR + path,
+            taskController, false, owner, absPathName + Path.SEPARATOR_CHAR + path,
             null);
         cleanupQueue.addToQueue(item);
       }
     } 
     //queue the parent directory  for cleanup
-    item = new TaskController.DeletionContext(
-        taskController, false, status.getOwner(), newPathName,
-        null);
+    item = new PathDeletionContext(
+        new Path(absPathName), null, null, null, localFileSystem);
     cleanupQueue.addToQueue(item);
   }