Merge -r 757447:757448 to move the change of HADOOP-5549 from main to branch 0.19.

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

CHANGES.txt

@@ -80,6 +80,9 @@ Release 0.19.2 - Unreleased
     HADOOP-5522. Documents the setup/cleanup tasks in the mapred tutorial.
     (Amareshwari Sriramadasu via ddas)
 
+    HADOOP-5549. ReplicationMonitor should schedule both replication and
+    deletion work in one iteration. (hairong)
+
 Release 0.19.1 - 2009-02-23 
 
     HADOOP-5225. Workaround for tmp file handling in HDFS. sync() is 

src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

@@ -2373,8 +2373,7 @@ public class FSNamesystem implements FSConstants, FSNamesystemMBean {
     underReplicatedBlocksCount = neededReplications.size();
     scheduledReplicationBlocksCount = workFound;
     
-    if(workFound == 0)
-      workFound = computeInvalidateWork(nodesToProcess);
+    workFound += computeInvalidateWork(nodesToProcess);
     return workFound;
   }