svn commit: r1085585 - in /hadoop/common/branches/branch-0.20-security: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

[suresh]

Author: suresh
Date: Fri Mar 25 22:30:16 2011
New Revision: 1085585

URL: http://svn.apache.org/viewvc?rev=1085585&view=rev
Log:
HDFS-1541. Not marking datanodes dead when namenode in safemode. Contributed by 
Hairong Kuang.

Modified:
    hadoop/common/branches/branch-0.20-security/CHANGES.txt
    
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

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=1085585&r1=1085584&r2=1085585&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Fri Mar 25 22:30:16 
2011
@@ -18,6 +18,11 @@ Release 0.20.204.0 - unreleased
     HDFS-1773. Do not show decommissioned datanodes, which are not in both
     include and exclude lists, on web and JMX interfaces.
     (Tanping Wang via szetszwo)
+  
+  IMPROVEMENTS
+
+    HDFS-1541. Not marking datanodes dead when namenode in safemode.
+    (hairong)
 
 Release 0.20.203.0 - unreleased
 

Modified: 
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1085585&r1=1085584&r2=1085585&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 (original)
+++ 
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 Fri Mar 25 22:30:16 2011
@@ -3086,6 +3086,10 @@ public class FSNamesystem implements FSC
    * effect causes more datanodes to be declared dead.
    */
   void heartbeatCheck() {
+    if (isInSafeMode()) {
+      // not to check dead nodes if in safemode
+      return;
+    }
     boolean allAlive = false;
     while (!allAlive) {
       boolean foundDead = false;