svn commit: r757448 - in /hadoop/core/trunk: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

[hairong]

Author: hairong
Date: Mon Mar 23 17:09:05 2009
New Revision: 757448

URL: http://svn.apache.org/viewvc?rev=757448&view=rev
Log:
HADOOP-5549. ReplicationMonitor should schedule both replication and deletion 
work in one iteration. Contributed by Hairong Kuang.

Modified:
    hadoop/core/trunk/CHANGES.txt
    
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=757448&r1=757447&r2=757448&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Mon Mar 23 17:09:05 2009
@@ -1135,6 +1135,9 @@
     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 
 
   IMPROVEMENTS

Modified: 
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=757448&r1=757447&r2=757448&view=diff
==============================================================================
--- 
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 (original)
+++ 
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 Mon Mar 23 17:09:05 2009
@@ -2392,8 +2392,7 @@
       corruptReplicaBlocksCount = corruptReplicas.size();
     }
     
-    if(workFound == 0)
-      workFound = computeInvalidateWork(nodesToProcess);
+    workFound += computeInvalidateWork(nodesToProcess);
     return workFound;
   }