svn commit: r507305 - in /lucene/hadoop/branches/branch-0.11: CHANGES.txt src/java/org/apache/hadoop/dfs/FSNamesystem.java

[cutting]

Author: cutting
Date: Tue Feb 13 15:35:17 2007
New Revision: 507305

URL: http://svn.apache.org/viewvc?view=rev&rev=507305
Log:
HADOOP-1009.  Merge -r 507273:507276 from trunk to 0.11 branch.

Modified:
    lucene/hadoop/branches/branch-0.11/CHANGES.txt
    
lucene/hadoop/branches/branch-0.11/src/java/org/apache/hadoop/dfs/FSNamesystem.java

Modified: lucene/hadoop/branches/branch-0.11/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.11/CHANGES.txt?view=diff&rev=507305&r1=507304&r2=507305
==============================================================================
--- lucene/hadoop/branches/branch-0.11/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.11/CHANGES.txt Tue Feb 13 15:35:17 2007
@@ -1,6 +1,12 @@
 Hadoop Change Log
 
 
+Branch 0.11 (unreleased)
+
+ 1. HADOOP-1009.  Fix an infinite loop in the HDFS namenode.
+    (Dhruba Borthakur via cutting) 
+
+
 Release 0.11.1 - 2007-02-09
 
  1. HADOOP-976.  Make SequenceFile.Metadata public.  (Runping Qi via cutting)

Modified: 
lucene/hadoop/branches/branch-0.11/src/java/org/apache/hadoop/dfs/FSNamesystem.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.11/src/java/org/apache/hadoop/dfs/FSNamesystem.java?view=diff&rev=507305&r1=507304&r2=507305
==============================================================================
--- 
lucene/hadoop/branches/branch-0.11/src/java/org/apache/hadoop/dfs/FSNamesystem.java
 (original)
+++ 
lucene/hadoop/branches/branch-0.11/src/java/org/apache/hadoop/dfs/FSNamesystem.java
 Tue Feb 13 15:35:17 2007
@@ -2870,9 +2870,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--;