svn commit: r547017 - in /lucene/hadoop/trunk: CHANGES.txt src/test/org/apache/hadoop/dfs/TestDecommission.java

[tomwhite]

Author: tomwhite
Date: Wed Jun 13 13:27:31 2007
New Revision: 547017

URL: http://svn.apache.org/viewvc?view=rev&rev=547017
Log:
HADOOP-1456.  Fix TestDecommission assertion failure by setting the namenode to 
ignore the load on datanodes while allocating replicas.  Contributed by Dhruba 
Borthakur.

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

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=547017&r1=547016&r2=547017
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Wed Jun 13 13:27:31 2007
@@ -107,6 +107,10 @@
  34. HADOOP-1447.  Add support in contrib/data_join for text inputs.
      (Senthil Subramanian via cutting)
 
+ 35. HADOOP-1456.  Fix TestDecommission assertion failure by setting
+     the namenode to ignore the load on datanodes while allocating
+     replicas.  (Dhruba Borthakur via tomwhite)
+
 
 Release 0.13.0 - 2007-06-08
 

Modified: 
lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/TestDecommission.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/TestDecommission.java?view=diff&rev=547017&r1=547016&r2=547017
==============================================================================
--- lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/TestDecommission.java 
(original)
+++ lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/TestDecommission.java 
Wed Jun 13 13:27:31 2007
@@ -127,13 +127,13 @@
       for (int j = 0; j < nodes.length; j++) {     // for each replica
         if (nodes[j].getName().equals(downnode)) {
           hasdown++;
-          System.out.println("Block " + blk + " replica " +
+          System.out.println("Block " + blk.getBlock() + " replica " +
                              nodes[j].getName() + " is decommissioned.");
         }
       }
-      System.out.println("Block " + blk + " has " + hasdown +
+      System.out.println("Block " + blk.getBlock() + " has " + hasdown +
                          " decommissioned replica.");
-      assertEquals("Number of replicas for block" + blk,
+      assertEquals("Number of replicas for block" + blk.getBlock(),
                    Math.min(numDatanodes, repl+hasdown), nodes.length);  
     }
   }
@@ -251,6 +251,7 @@
    */
   public void testDecommission() throws IOException {
     Configuration conf = new Configuration();
+    conf.setBoolean("dfs.replication.considerLoad", false);
 
     // Set up the hosts/exclude files.
     FileSystem localFileSys = FileSystem.getLocal(conf);