HDFS-1836. Thousand of CLOSE_WAIT socket. Contributed by Todd Lipcon

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20@1104565 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -106,6 +106,8 @@ Release 0.20.3 - 2011-1-5
 
     HADOOP-6882. Update the version of Jetty to 6.1.26. (omalley)
 
+    HDFS-1836. Thousand of CLOSE_WAIT socket. (todd via eli)
+
 Release 0.20.2 - 2010-2-19
 
   NEW FEATURES

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

@@ -2366,11 +2366,7 @@ public class DFSClient implements FSConstants, java.io.Closeable {
             }
 
             synchronized (dataQueue) {
-              try {
-                blockStream.close();
-                blockReplyStream.close();
-              } catch (IOException e) {
-              }
+              IOUtils.cleanup(LOG, blockStream, blockReplyStream);
               nodes = null;
               response = null;
               blockStream = null;
@@ -2513,11 +2509,7 @@ public class DFSClient implements FSConstants, java.io.Closeable {
       }
 
       if (blockStream != null) {
-        try {
-          blockStream.close();
-          blockReplyStream.close();
-        } catch (IOException e) {
-        }
+        IOUtils.cleanup(LOG, blockStream, blockReplyStream);
       }
       blockStream = null;
       blockReplyStream = null;
@@ -3248,8 +3240,7 @@ public class DFSClient implements FSConstants, java.io.Closeable {
         synchronized (dataQueue) {
           if (blockStream != null) {
             blockStream.writeInt(0); // indicate end-of-block to datanode
-            blockStream.close();
-            blockReplyStream.close();
+            IOUtils.cleanup(LOG, blockStream, blockReplyStream);
           }
           if (s != null) {
             s.close();