You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by sz...@apache.org on 2011/07/05 19:19:07 UTC
svn commit: r1143147 - in /hadoop/common/trunk/hdfs: CHANGES.txt
src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
Author: szetszwo
Date: Tue Jul 5 17:19:07 2011
New Revision: 1143147
URL: http://svn.apache.org/viewvc?rev=1143147&view=rev
Log:
HDFS-1990. Fix resource leaks in BlockReceiver.close(). Contributed by Uma Maheswara Rao G
Modified:
hadoop/common/trunk/hdfs/CHANGES.txt
hadoop/common/trunk/hdfs/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
Modified: hadoop/common/trunk/hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hdfs/CHANGES.txt?rev=1143147&r1=1143146&r2=1143147&view=diff
==============================================================================
--- hadoop/common/trunk/hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hdfs/CHANGES.txt Tue Jul 5 17:19:07 2011
@@ -805,6 +805,9 @@ Trunk (unreleased changes)
HDFS-2053. Bug in INodeDirectory#computeContentSummary warning.
(Michael Noll via eli)
+ HDFS-1990. Fix resource leaks in BlockReceiver.close(). (Uma Maheswara
+ Rao G via szetszwo)
+
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/hdfs/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hdfs/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java?rev=1143147&r1=1143146&r2=1143147&view=diff
==============================================================================
--- hadoop/common/trunk/hdfs/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java (original)
+++ hadoop/common/trunk/hdfs/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java Tue Jul 5 17:19:07 2011
@@ -231,6 +231,9 @@ class BlockReceiver implements Closeable
} catch(IOException e) {
ioe = e;
}
+ finally {
+ IOUtils.closeStream(checksumOut);
+ }
// close block file
try {
if (out != null) {
@@ -244,6 +247,9 @@ class BlockReceiver implements Closeable
} catch (IOException e) {
ioe = e;
}
+ finally{
+ IOUtils.closeStream(out);
+ }
// disk check
if(ioe != null) {
datanode.checkDiskError(ioe);