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 ki...@apache.org on 2013/06/04 23:49:18 UTC
svn commit: r1489642 - in
/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt
src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
Author: kihwal
Date: Tue Jun 4 21:49:09 2013
New Revision: 1489642
URL: http://svn.apache.org/r1489642
Log:
svn merge -c 1489634 Merging from trunk to branch-2 to fix HDFS-4840.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1489642&r1=1489641&r2=1489642&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Tue Jun 4 21:49:09 2013
@@ -340,6 +340,8 @@ Release 2.1.0-beta - UNRELEASED
HDFS-4382. Fix typo MAX_NOT_CHANGED_INTERATIONS. (Ted Yu via suresh)
+ HDFS-4840. ReplicationMonitor gets NPE during shutdown. (kihwal)
+
BREAKDOWN OF HDFS-347 SUBTASKS AND RELATED JIRAS
HDFS-4353. Encapsulate connections to peers in Peer and PeerServer classes.
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java?rev=1489642&r1=1489641&r2=1489642&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java Tue Jun 4 21:49:09 2013
@@ -3078,10 +3078,15 @@ assert storedBlock.findDatanode(dn) < 0
computeDatanodeWork();
processPendingReplications();
Thread.sleep(replicationRecheckInterval);
- } catch (InterruptedException ie) {
- LOG.warn("ReplicationMonitor thread received InterruptedException.", ie);
- break;
} catch (Throwable t) {
+ if (!namesystem.isRunning()) {
+ LOG.info("Stopping ReplicationMonitor.");
+ if (!(t instanceof InterruptedException)) {
+ LOG.info("ReplicationMonitor received an exception"
+ + " while shutting down.", t);
+ }
+ break;
+ }
LOG.fatal("ReplicationMonitor thread received Runtime exception. ", t);
terminate(1, t);
}