HADOOP-1009. Merge -r 507273:507276 from trunk to 0.11 branch.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/branches/branch-0.11@507305 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -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)

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

@@ -2870,9 +2870,7 @@ class FSNamesystem implements FSConstants {
             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--;