HADOOP-2159. Name node should not decrment blockSafe for invalid blocks. Contributed by Hairong Kuang.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@661912 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -359,6 +359,9 @@ Trunk (unreleased changes)
 
     HADOOP-3401. Update FileBench to set the new
     "mapred.work.output.dir" property to work post-3041. (cdouglas via omalley)
+
+    HADOOP-2159 Namenode stuck in safemode. The counter blockSafe should
+    not be decremented for invalid blocks. (hairong)
  
 Release 0.17.0 - 2008-05-18
 

src/java/org/apache/hadoop/dfs/FSNamesystem.java

@@ -2926,7 +2926,6 @@ class FSNamesystem implements FSConstants, FSNamesystemMBean {
       return;
     }
         
-    decrementSafeBlockCount(block);
     //
     // It's possible that the block was removed because of a datanode
     // failure.  If the block is still valid, check if replication is
@@ -2935,6 +2934,7 @@ class FSNamesystem implements FSConstants, FSNamesystemMBean {
     //
     INode fileINode = blocksMap.getINode(block);
     if (fileINode != null) {
+      decrementSafeBlockCount(block);
       updateNeededReplications(block, -1, 0);
     }