HADOOP-2121. Cleanup DFSOutputStream when the stream encountered errors

when Datanodes became full.  (Raghu Angadi via dhruba)



git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@594274 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -88,9 +88,12 @@ Trunk (unreleased changes)
     Now invalid options are caught, logged and jobs are failed early. (Lohit
     Vijayarenu via acmurthy)
 
-    HADOOP-2151. FileSyste.globPaths validates the list of Paths that
+    HADOOP-2151. FileSystem.globPaths validates the list of Paths that
     it returns.  (Lohit Vijayarenu via dhruba)
 
+    HADOOP-2121. Cleanup DFSOutputStream when the stream encountered errors
+    when Datanodes became full.  (Raghu Angadi via dhruba)
+
 Release 0.15.1 -
 
   BUG FIXES

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

@@ -1701,6 +1701,22 @@ class DFSClient implements FSConstants {
       namenode.abandonBlock(block, src.toString());
     }
 
+    private void internalClose() throws IOException {
+      // Clean up any resources that might be held.
+      closed = true;
+      
+      synchronized (pendingCreates) {
+        pendingCreates.remove(src);
+      }
+      
+      if (s != null) {
+        s.close();
+        s = null;
+      }
+      
+      closeBackupStream();
+    }
+    
     /**
      * Closes this output stream and releases any system 
      * resources associated with this stream.
@@ -1712,9 +1728,9 @@ class DFSClient implements FSConstants {
         throw new IOException("Stream closed");
       }
       
-      flushBuffer();
-      
       try {
+        flushBuffer();
+        
         if (filePos == 0 || bytesWrittenToBlock != 0) {
           try {
             endBlock();
@@ -1743,11 +1759,8 @@ class DFSClient implements FSConstants {
             }
           }
         }
-        closed = true;
       } finally {
-        synchronized (pendingCreates) {
-          pendingCreates.remove(src.toString());
-        }
+        internalClose();
       }
     }
   }

src/java/org/apache/hadoop/fs/FSOutputSummer.java

@@ -119,8 +119,9 @@ abstract public class FSOutputSummer extends OutputStream {
    */
   protected synchronized void flushBuffer() throws IOException {
     if(count != 0) {
-      writeChecksumChunk(buf, 0, count);
+      int chunkLen = count;
       count = 0;
+      writeChecksumChunk(buf, 0, chunkLen);
     }
   }