Author: suresh Date: Mon Aug 22 21:34:09 2011 New Revision: 1160447 URL: http://svn.apache.org/viewvc?rev=1160447&view=rev Log: Merging HDFS-1118 change r956329 from 0.20-append to 0.20-security
Modified: hadoop/common/branches/branch-0.20-security/ (props changed) hadoop/common/branches/branch-0.20-security/CHANGES.txt (contents, props changed) hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/fs/HarFileSystem.java (props changed) hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java hadoop/common/branches/branch-0.20-security/src/mapred/ (props changed) hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/fs/TestHarFileSystem.java (props changed) hadoop/common/branches/branch-0.20-security/src/tools/org/apache/hadoop/tools/HadoopArchives.java (props changed) Propchange: hadoop/common/branches/branch-0.20-security/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 22 21:34:09 2011 @@ -1,5 +1,5 @@ /hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225 -/hadoop/common/branches/branch-0.20-append:955380,955398,955448 +/hadoop/common/branches/branch-0.20-append:955380,955398,955448,956329 /hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115 /hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413 /hadoop/core/branches/branch-0.19:713112 Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1160447&r1=1160446&r2=1160447&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Mon Aug 22 21:34:09 2011 @@ -45,6 +45,9 @@ Release 0.20.205.0 - unreleased HDFS-606. Fix ConcurrentModificationException in invalidateCorruptReplicas. (Todd Lipcon via dhruba) + HDFS-1118. Fix socketleak on DFSClient. + (Zheng Shao via dhruba) + IMPROVEMENTS MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via Propchange: hadoop/common/branches/branch-0.20-security/CHANGES.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 22 21:34:09 2011 @@ -1,5 +1,5 @@ /hadoop/common/branches/branch-0.20/CHANGES.txt:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225 -/hadoop/common/branches/branch-0.20-append/CHANGES.txt:955380,955398,955448 +/hadoop/common/branches/branch-0.20-append/CHANGES.txt:955380,955398,955448,956329 /hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115 /hadoop/common/branches/branch-0.20-security-204/CHANGES.txt:1128390,1147228,1148069,1149316,1154413,1159730 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226 Propchange: hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/fs/HarFileSystem.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 22 21:34:09 2011 @@ -1,5 +1,5 @@ /hadoop/common/branches/branch-0.20/src/core/org/apache/hadoop/fs/HarFileSystem.java:990003 -/hadoop/common/branches/branch-0.20-append/src/core/org/apache/hadoop/fs/HarFileSystem.java:955380,955398,955448 +/hadoop/common/branches/branch-0.20-append/src/core/org/apache/hadoop/fs/HarFileSystem.java:955380,955398,955448,956329 /hadoop/common/branches/branch-0.20-security-203/src/core/org/apache/hadoop/fs/HarFileSystem.java:1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1128115 /hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/fs/HarFileSystem.java:1128390 /hadoop/common/trunk/src/core/org/apache/hadoop/fs/HarFileSystem.java:910709 Modified: hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java?rev=1160447&r1=1160446&r2=1160447&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java (original) +++ hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java Mon Aug 22 21:34:09 2011 @@ -3033,6 +3033,7 @@ public class DFSClient implements FSCons // persist blocks on namenode on next flush persistBlocks = true; + boolean result = false; try { LOG.debug("Connecting to " + nodes[0].getName()); InetSocketAddress target = NetUtils.createSocketAddr(nodes[0].getName()); @@ -3084,7 +3085,7 @@ public class DFSClient implements FSCons } blockStream = out; - return true; // success + result = true; // success } catch (IOException ie) { @@ -3102,8 +3103,14 @@ public class DFSClient implements FSCons hasError = true; setLastException(ie); blockReplyStream = null; - return false; // error + result = false; + } finally { + if (!result) { + IOUtils.closeSocket(s); + s = null; + } } + return result; } private LocatedBlock locateFollowingBlock(long start Propchange: hadoop/common/branches/branch-0.20-security/src/mapred/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 22 21:34:09 2011 @@ -1,5 +1,5 @@ /hadoop/common/branches/branch-0.20/src/mapred:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225 -/hadoop/common/branches/branch-0.20-append/src/mapred:955380,955398,955448 +/hadoop/common/branches/branch-0.20-append/src/mapred:955380,955398,955448,956329 /hadoop/common/branches/branch-0.20-security-203/src/mapred:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1128115 /hadoop/common/branches/branch-0.20-security-204/src/mapred:1128390 /hadoop/core/branches/branch-0.19/src/mapred:713112 Propchange: hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/fs/TestHarFileSystem.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 22 21:34:09 2011 @@ -1,5 +1,5 @@ /hadoop/common/branches/branch-0.20/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:990003 -/hadoop/common/branches/branch-0.20-append/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:955380,955398,955448 +/hadoop/common/branches/branch-0.20-append/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:955380,955398,955448,956329 /hadoop/common/branches/branch-0.20-security-203/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1128115 /hadoop/common/branches/branch-0.20-security-204/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:1128390 /hadoop/common/trunk/src/test/core/org/apache/hadoop/fs/TestHarFileSystem.java:979485 Propchange: hadoop/common/branches/branch-0.20-security/src/tools/org/apache/hadoop/tools/HadoopArchives.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 22 21:34:09 2011 @@ -1,5 +1,5 @@ /hadoop/common/branches/branch-0.20/src/tools/org/apache/hadoop/tools/HadoopArchives.java:990003 -/hadoop/common/branches/branch-0.20-append/src/tools/org/apache/hadoop/tools/HadoopArchives.java:955380,955398,955448 +/hadoop/common/branches/branch-0.20-append/src/tools/org/apache/hadoop/tools/HadoopArchives.java:955380,955398,955448,956329 /hadoop/common/branches/branch-0.20-security-203/src/tools/org/apache/hadoop/tools/HadoopArchives.java:1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1128115 /hadoop/common/branches/branch-0.20-security-204/src/tools/org/apache/hadoop/tools/HadoopArchives.java:1128390 /hadoop/common/trunk/src/tools/org/apache/hadoop/tools/HadoopArchives.java:910709