[jboss-cvs] JBoss Messaging SVN: r5664 - in branches/Branch_1_4: tests/src/org/jboss/test/messaging/jms/clustering and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: gaohoward
Date: 2009-01-19 20:38:41 -0500 (Mon, 19 Jan 2009)
New Revision: 5664

Modified:
   branches/Branch_1_4/integration/EAP4/etc/remoting/remoting-bisocket-service.xml
   branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java
Log:
JBMESSAGING-1487


Modified: branches/Branch_1_4/integration/EAP4/etc/remoting/remoting-bisocket-service.xml
===================================================================
--- branches/Branch_1_4/integration/EAP4/etc/remoting/remoting-bisocket-service.xml	2009-01-19 23:17:15 UTC (rev 5663)
+++ branches/Branch_1_4/integration/EAP4/etc/remoting/remoting-bisocket-service.xml	2009-01-20 01:38:41 UTC (rev 5664)
@@ -39,8 +39,8 @@
                
                <!-- Periodicity of client pings. Server window by default is twice this figure -->                               
                <attribute name="clientLeasePeriod" isParam="true">10000</attribute>
-               <attribute name="validatorPingPeriod" isParam="true">2000</attribute>
-               <attribute name="validatorPingTimeout" isParam="true">1000</attribute>
+               <attribute name="validatorPingPeriod" isParam="true">10000</attribute>
+               <attribute name="validatorPingTimeout" isParam="true">5000</attribute>
                <attribute name="registerCallbackListener">false</attribute>
 	       	       
 	            <attribute name="timeout" isParam="true">0</attribute>

Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java	2009-01-19 23:17:15 UTC (rev 5663)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java	2009-01-20 01:38:41 UTC (rev 5664)
@@ -34,6 +34,7 @@
 
 /**
  * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
+ * @author <a href="mailto:hgao at redhat.com">Howard Gao</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$
@@ -76,7 +77,11 @@
 
       // Kill the same node as the CF is connected to
       ServerManagement.kill(1);
-      Thread.sleep(5000);
+      
+      // the sleep time has to be longer than the sum of validatorPingPeriod and validatorPingTimeout.
+      // see remoting-bisocket-service.xml
+      Thread.sleep(20000);
+      
       assertEquals(1, clusterDelegate.getDelegates().length);
       TopologyResult topology = clusterDelegate.getTopology();
       assertEquals(1, topology.getDelegates().length);
@@ -188,7 +193,7 @@
 
       ServerManagement.kill(1);
    	
-   	Thread.sleep(5000);
+   	Thread.sleep(20000);
    	
    	Connection conn = createConnectionOnServer(cf, 0);
       try
@@ -308,8 +313,8 @@
 
       ServerManagement.kill(1);
 
-      log.info("sleeping 5 secs ...");
-      Thread.sleep(5000);
+      log.info("sleeping 20 secs ...");
+      Thread.sleep(20000);
 
       // first part of the test, verifies if the CF was updated
       assertEquals(1, cfDelegate.getDelegates().length);
@@ -353,15 +358,15 @@
 
       ServerManagement.kill(1);
 
-      log.info("sleeping 5 secs ...");
-      Thread.sleep(5000);
+      log.info("sleeping 20 secs ...");
+      Thread.sleep(20000);
 
       // first part of the test, verifies if the CF was updated
       assertEquals(1, cfDelegate.getDelegates().length);
       conn.close();
 
       log.info("sleeping 5 secs ...");
-      Thread.sleep(5000);
+      Thread.sleep(20000);
 
       // Second part, verifies a possible race condition on failoverMap and handleFilover
       assertEquals(0, getServerId(conn1));
@@ -369,7 +374,7 @@
       //restart
       ServerManagement.start(1, "all", false);
       
-      Thread.sleep(5000);
+      Thread.sleep(12000);
       
       assertEquals(2, cfDelegate.getDelegates().length);
       
@@ -461,7 +466,7 @@
 
       ServerManagement.kill(1);
 
-      Thread.sleep(5000);
+      Thread.sleep(20000);
 
       // This will force Failover from Valve to kick in
       conn1.createSession(true, Session.SESSION_TRANSACTED);