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 su...@apache.org on 2013/04/27 16:08:35 UTC
svn commit: r1476579 - in
/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt
src/main/java/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java
Author: suresh
Date: Sat Apr 27 14:08:34 2013
New Revision: 1476579
URL: http://svn.apache.org/r1476579
Log:
HDFS-4768. File handle leak in datanode when a block pool is removed. Contributed by Chris Nauroth.
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1476579&r1=1476578&r2=1476579&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Sat Apr 27 14:08:34 2013
@@ -582,6 +582,9 @@ Release 2.0.5-beta - UNRELEASED
HDFS-4745. TestDataTransferKeepalive#testSlowReader has race condition that
causes sporadic failure. (Chris Nauroth via suresh)
+ HDFS-4768. File handle leak in datanode when a block pool is removed.
+ (Chris Nauroth via suresh)
+
Release 2.0.4-alpha - UNRELEASED
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java?rev=1476579&r1=1476578&r2=1476579&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java Sat Apr 27 14:08:34 2013
@@ -267,7 +267,10 @@ public class DataBlockScanner implements
}
public synchronized void removeBlockPool(String blockPoolId) {
- blockPoolScannerMap.remove(blockPoolId);
+ BlockPoolSliceScanner bpss = blockPoolScannerMap.remove(blockPoolId);
+ if (bpss != null) {
+ bpss.shutdown();
+ }
LOG.info("Removed bpid="+blockPoolId+" from blockPoolScannerMap");
}