HADOOP-4935. Merge -r 730276:730277 from trunk to branch 0.18.

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

CHANGES.txt

@@ -124,6 +124,9 @@ Release 0.18.3 - Unreleased
     HADOOP-3780. Fixes a problem to do with NPE due to nodes not being
     resolved by the resolution thread in time. (Ravia Gummadi via ddas)
 
+    HADOOP-4935. processMisReplicatedBlocks() should not clear 
+    excessReplicateMap. (shv)
+
 Release 0.18.2 - 2008-11-03
 
   BUG FIXES

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

@@ -2920,7 +2920,6 @@ class FSNamesystem implements FSConstants, FSNamesystemMBean {
   private synchronized void processMisReplicatedBlocks() {
     long nrInvalid = 0, nrOverReplicated = 0, nrUnderReplicated = 0;
     neededReplications.clear();
-    excessReplicateMap.clear();
     for(BlocksMap.BlockInfo block : blocksMap.getBlocks()) {
       INodeFile fileINode = block.getINode();
       if(fileINode == null) {