svn commit: r1082404 - in /hbase/branches/0.90: CHANGES.txt src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java

[todd]

Author: todd
Date: Thu Mar 17 06:03:19 2011
New Revision: 1082404

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

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

Modified: hbase/branches/0.90/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1082404&r1=1082403&r2=1082404&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Thu Mar 17 06:03:19 2011
@@ -32,6 +32,7 @@ Release 0.90.2 - February 9th, 2011
    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/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java?rev=1082404&r1=1082403&r2=1082404&view=diff
==============================================================================
--- 
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
 (original)
+++ 
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
 Thu Mar 17 06:03:19 2011
@@ -102,6 +102,8 @@ public class TestHLog  {
     TEST_UTIL.getConfiguration().setInt("heartbeat.recheck.interval", 5000);
     TEST_UTIL.getConfiguration().setInt("dfs.heartbeat.interval", 1);
     TEST_UTIL.getConfiguration().setInt("dfs.socket.timeout", 5000);
+    TEST_UTIL.getConfiguration().setInt(
+      "ipc.client.connection.maxidletime", 500);
     // faster failover with cluster.shutdown();fs.close() idiom
     TEST_UTIL.getConfiguration()
         .setInt("ipc.client.connect.max.retries", 1);
@@ -365,6 +367,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();