svn commit: r755226 - in /hadoop/core/trunk: CHANGES.txt src/mapred/org/apache/hadoop/mapred/CleanupQueue.java

[dd...@apache.org]

Author: ddas
Date: Tue Mar 17 12:52:54 2009
New Revision: 755226

URL: http://svn.apache.org/viewvc?rev=755226&view=rev
Log:
HADOOP-5483. Fixes a problem in the Directory Cleanup Thread due to which TestMiniMRWithDFS sometimes used to fail. Contributed by Devaraj Das.

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/CleanupQueue.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=755226&r1=755225&r2=755226&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Tue Mar 17 12:52:54 2009
@@ -1013,6 +1013,9 @@
     and that brings down the log messages in the JobClient to do with 
     NetworkTopology.add significantly. (Jothi Padmanabhan via ddas)
 
+    HADOOP-5483. Fixes a problem in the Directory Cleanup Thread due to which
+    TestMiniMRWithDFS sometimes used to fail. (ddas) 
+
 Release 0.19.2 - Unreleased
 
   BUG FIXES

Modified: hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/CleanupQueue.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/CleanupQueue.java?rev=755226&r1=755225&r2=755226&view=diff
==============================================================================
--- hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/CleanupQueue.java (original)
+++ hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/CleanupQueue.java Tue Mar 17 12:52:54 2009
@@ -91,10 +91,11 @@
           FileSystem fs = pathAndConf.path.getFileSystem(pathAndConf.conf);
           fs.delete(pathAndConf.path, true);
           LOG.debug("DELETED " + pathAndConf.path);
-        } catch (IOException e) {
-          LOG.warn("Error deleting path" + pathAndConf.path);
         } catch (InterruptedException t) {
-        }
+          return;
+        } catch (Exception e) {
+          LOG.warn("Error deleting path" + pathAndConf.path);
+        } 
       }
     }
   }