svn commit: r1076416 - in /hadoop/hdfs/branches/HDFS-1052: CHANGES.txt src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestBlockReport.java

[su...@apache.org]

Author: suresh
Date: Wed Mar  2 21:51:09 2011
New Revision: 1076416

URL: http://svn.apache.org/viewvc?rev=1076416&view=rev
Log:
HDFS:1699. Federation: Fix failure of TestBlockReport. Contributed by Matt Foley.

Modified:
    hadoop/hdfs/branches/HDFS-1052/CHANGES.txt
    hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestBlockReport.java

Modified: hadoop/hdfs/branches/HDFS-1052/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/CHANGES.txt?rev=1076416&r1=1076415&r2=1076416&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/CHANGES.txt (original)
+++ hadoop/hdfs/branches/HDFS-1052/CHANGES.txt Wed Mar  2 21:51:09 2011
@@ -101,7 +101,7 @@ Trunk (unreleased changes)
     with multiple Block Pools (boryas)
 
     HDFS-1687. Federation: DirectoryScanner changes for 
-    federation (mattf via boryas)
+    federation (Matt Foley via boryas)
 
     HDFS-1626. Make BLOCK_INVALIDATE_LIMIT configurable. (szetszwo)
 
@@ -123,17 +123,20 @@ Trunk (unreleased changes)
     HDFS-1678. Federation: Remove unnecessary #getBlockpool() 
     for NameNodeMXBean in FSNameSystem. (Tanping via Suresh)
 
-    HDFS-1688. Fix failures in fault injection tests, TestDiskError, 
-    TestDatanodeRestart and TestDFSTartupVersions. (suresh)
+    HDFS-1688. Federation: Fix failures in fault injection tests,
+    TestDiskError, TestDatanodeRestart and TestDFSTartupVersions. (suresh)
 
-    HDFS-1696. HDFS Federation: when build version doesn't match - 
+    HDFS-1696. Federation: when build version doesn't match - 
     datanode should wait (keep connecting) untill NN comes up 
     with the right version (boryas)
 
-    HDFS-1681. Balancer: support per pool and per node policies.  (szetszwo)
+    HDFS-1681. Balancer: support per pool and per node policies. (szetszwo)
 
-    HDFS-1695. HDFS federation: Fix testOIV and 
-    TestDatanodeUtils (jhoman and tanping via boryas)
+    HDFS-1695. Federation: Fix testOIV and TestDatanodeUtils 
+    (jhoman and tanping via boryas)
+
+    HDFS:1699. Federation: Fix failure of TestBlockReport.
+    (Matt Foley via suresh)
 
   IMPROVEMENTS
 

Modified: hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestBlockReport.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestBlockReport.java?rev=1076416&r1=1076415&r2=1076416&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestBlockReport.java (original)
+++ hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestBlockReport.java Wed Mar  2 21:51:09 2011
@@ -489,7 +489,7 @@ public class TestBlockReport {
     }
   }
 
-  private void waitForTempReplica(Block bl, int DN_N1) {
+  private void waitForTempReplica(Block bl, int DN_N1) throws IOException {
     final boolean tooLongWait = false;
     final int TIMEOUT = 40000;
     
@@ -502,6 +502,8 @@ public class TestBlockReport {
     if(LOG.isDebugEnabled()) {
       LOG.debug("Total number of DNs " + cluster.getDataNodes().size());
     }
+    cluster.waitActive();
+    
     // Look about specified DN for the replica of the block from 1st DN
     String bpid = cluster.getNamesystem().getBlockPoolId();
     Replica r = ((FSDataset) cluster.getDataNodes().get(DN_N1).getFSDataset()).