Merge -r 557779:557780 from trunk to 0.14 branch. Fixes: HADOOP-1625.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/branches/branch-0.14@557782 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -376,6 +376,9 @@ Branch 0.14 (unreleased changes)
 117. HADOOP-1620.  Reduce the number of abstract FileSystem methods,
      simplifying implementations.  (cutting)
 
+118. HADOOP-1625.  Fix a "could not move files" exception in datanode.
+     (Raghu Angadi via cutting)
+
 
 Release 0.13.0 - 2007-06-08
 

src/java/org/apache/hadoop/dfs/DataNode.java

@@ -946,6 +946,14 @@ public class DataNode implements FSConstants, Runnable {
               // Write checksum
               checksumOut.write( buf, len, checksumSize );
               myMetrics.wroteBytes( len );
+            } else {
+              /* Should we sync() files here? It can add many millisecs of
+               * latency. We did not sync before HADOOP-1134 either.
+               */ 
+              out.close();
+              out = null;
+              checksumOut.close();
+              checksumOut = null;
             }
             
           } catch (IOException iex) {