svn commit: r1082403 - in /hbase/trunk: CHANGES.txt src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java

[todd]

Author: todd
Date: Thu Mar 17 05:59:29 2011
New Revision: 1082403

URL: http://svn.apache.org/viewvc?rev=1082403&view=rev
Log:
HBASE-3659  Fix TestHLog to pass on newer versions of Hadoop

Modified:
    hbase/trunk/CHANGES.txt
    
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java

Modified: hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1082403&r1=1082402&r2=1082403&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu Mar 17 05:59:29 2011
@@ -170,6 +170,7 @@ Release 0.90.2 - Unreleased
    HBASE-3648  [replication] failover is sloppy with znodes
    HBASE-3613  NPE in MemStoreFlusher
    HBASE-3650  HBA.delete can return too fast
+   HBASE-3659  Fix TestHLog to pass on newer versions of Hadoop
 
   IMPROVEMENTS
    HBASE-3542  MultiGet methods in Thrift

Modified: 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java?rev=1082403&r1=1082402&r2=1082403&view=diff
==============================================================================
--- 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
 (original)
+++ 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
 Thu Mar 17 05:59:29 2011
@@ -111,6 +111,8 @@ public class TestHLog  {
         .setInt("ipc.client.connect.max.retries", 1);
     TEST_UTIL.getConfiguration().setInt(
         "dfs.client.block.recovery.retries", 1);
+    TEST_UTIL.getConfiguration().setInt(
+      "ipc.client.connection.maxidletime", 500);
     TEST_UTIL.getConfiguration().set(CoprocessorHost.WAL_COPROCESSOR_CONF_KEY,
         SampleRegionWALObserver.class.getName());
     TEST_UTIL.startMiniCluster(3);
@@ -371,6 +373,13 @@ public class TestHLog  {
         LOG.error("Waiting for cluster to go down");
         Thread.sleep(1000);
       }
+
+      // Workaround a strange issue with Hadoop's RPC system - if we don't
+      // sleep here, the new datanodes will pick up a cached IPC connection to
+      // the old (dead) NN and fail to start. Sleeping 2 seconds goes past
+      // the idle time threshold configured in the conf above
+      Thread.sleep(2000);
+
       cluster = new MiniDFSCluster(namenodePort, conf, 5, false, true, true, 
null, null, null, null);
       cluster.waitActive();
       fs = cluster.getFileSystem();