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 el...@apache.org on 2012/08/16 00:43:02 UTC
svn commit: r1373664 - in
/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt
src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
Author: eli
Date: Wed Aug 15 22:43:01 2012
New Revision: 1373664
URL: http://svn.apache.org/viewvc?rev=1373664&view=rev
Log:
HDFS-3048. Small race in BlockManager#close. Contributed by Andy Isaacson
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/blockmanagement/BlockManager.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=1373664&r1=1373663&r2=1373664&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Wed Aug 15 22:43:01 2012
@@ -614,6 +614,8 @@ Branch-2 ( Unreleased changes )
header when offset is specified and length is omitted.
(Ravi Prakash via szetszwo)
+ HDFS-3048. Small race in BlockManager#close. (Andy Isaacson via eli)
+
BREAKDOWN OF HDFS-3042 SUBTASKS
HDFS-2185. HDFS portion of ZK-based FailoverController (todd)
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java?rev=1373664&r1=1373663&r2=1373664&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java Wed Aug 15 22:43:01 2012
@@ -373,10 +373,17 @@ public class BlockManager {
}
public void close() {
- if (pendingReplications != null) pendingReplications.stop();
- blocksMap.close();
- datanodeManager.close();
- if (replicationThread != null) replicationThread.interrupt();
+ try {
+ if (replicationThread != null) {
+ replicationThread.interrupt();
+ replicationThread.join(3000);
+ }
+ } catch (InterruptedException ie) {
+ } finally {
+ if (pendingReplications != null) pendingReplications.stop();
+ blocksMap.close();
+ datanodeManager.close();
+ }
}
/** @return the datanodeManager */