svn commit: r507274 - in /lucene/hadoop/trunk: CHANGES.txt src/java/org/apache/hadoop/dfs/FSNamesystem.java

[cutting]

Author: cutting
Date: Tue Feb 13 14:38:48 2007
New Revision: 507274

URL: http://svn.apache.org/viewvc?view=rev&rev=507274
Log:
HADOOP-1009.  Fix an infinite loop in the HDFS namenode.  Contributed by Dhruba.

Modified:
    lucene/hadoop/trunk/CHANGES.txt
    lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=507274&r1=507273&r2=507274
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Tue Feb 13 14:38:48 2007
@@ -49,6 +49,9 @@
 14. HADOOP-476.  Rewrite contrib/streaming command-line processing,
     improving parameter validation.  (Sanjay Dahiya via cutting)
 
+15. HADOOP-1009.  Fix an infinite loop in the HDFS namenode.
+    (Dhruba Borthakur via cutting) 
+
 
 Release 0.11.1 - 2007-02-09
 

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java?view=diff&rev=507274&r1=507273&r2=507274
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java 
(original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java Tue 
Feb 13 14:38:48 2007
@@ -3019,9 +3019,7 @@
             numOfAvailableNodes:numOfReplicas;
         while( numOfReplicas > 0 ) {
           DatanodeDescriptor choosenNode = nodes[r.nextInt(nodes.length)];
-          if(!excludedNodes.contains(choosenNode) &&
-               !choosenNode.isDecommissionInProgress() &&
-               !choosenNode.isDecommissioned()) {
+          if(!excludedNodes.contains(choosenNode)) {
             results.add( choosenNode );
             excludedNodes.add(choosenNode);
             numOfReplicas--;