You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ma...@apache.org on 2011/06/15 01:18:24 UTC
svn commit: r1135845 - in /hadoop/common/branches/branch-0.20-security-205:
CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
Author: mattf
Date: Tue Jun 14 23:18:24 2011
New Revision: 1135845
URL: http://svn.apache.org/viewvc?rev=1135845&view=rev
Log:
HDFS-1836. Thousand of CLOSE_WAIT socket. Contributed by Todd Lipcon, ported to security branch by Bharath Mundlapudi.
Modified:
hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
hadoop/common/branches/branch-0.20-security-205/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt?rev=1135845&r1=1135844&r2=1135845&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Tue Jun 14 23:18:24 2011
@@ -1,5 +1,16 @@
Hadoop Change Log
+Release 0.20.206.0 - unreleased
+
+ NEW FEATURES
+
+ BUG FIXES
+
+ IMPROVEMENTS
+
+ HDFS-1836. Thousand of CLOSE_WAIT socket. Contributed by Todd Lipcon,
+ ported to security branch by Bharath Mundlapudi. (via mattf)
+
Release 0.20.205.0 - unreleased
BUG FIXES
Modified: hadoop/common/branches/branch-0.20-security-205/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java?rev=1135845&r1=1135844&r2=1135845&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java (original)
+++ hadoop/common/branches/branch-0.20-security-205/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java Tue Jun 14 23:18:24 2011
@@ -2526,11 +2526,7 @@ public class DFSClient implements FSCons
}
synchronized (dataQueue) {
- try {
- blockStream.close();
- blockReplyStream.close();
- } catch (IOException e) {
- }
+ IOUtils.cleanup(LOG, blockStream, blockReplyStream);
nodes = null;
response = null;
blockStream = null;
@@ -2670,11 +2666,7 @@ public class DFSClient implements FSCons
}
if (blockStream != null) {
- try {
- blockStream.close();
- blockReplyStream.close();
- } catch (IOException e) {
- }
+ IOUtils.cleanup(LOG, blockStream, blockReplyStream);
}
blockStream = null;
blockReplyStream = null;
@@ -3417,8 +3409,7 @@ public class DFSClient implements FSCons
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();