Merge -r 661911:661912 from trunk to main to move the change log of HADOOP-2159 into the release 0.17.1 section

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.17@661914 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -1,6 +1,13 @@
 Hadoop Change Log
 
 
+Release 0.17.1
+
+  BUG FIXES
+
+    HADOOP-2159 Namenode stuck in safemode. The counter blockSafe should
+    not be decremented for invalid blocks. (hairong)
+ 
 Release 0.17.0 - 2008-05-18
 
   INCOMPATIBLE CHANGES

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

@@ -3065,7 +3065,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
@@ -3074,6 +3073,7 @@ class FSNamesystem implements FSConstants, FSNamesystemMBean {
     //
     INode fileINode = blocksMap.getINode(block);
     if (fileINode != null) {
+      decrementSafeBlockCount(block);
       updateNeededReplications(block, -1, 0);
     }