[jboss-cvs] JBoss Messaging SVN: r1748 - in branches/Branch_Client_Failover_Experiment: src/main/org/jboss/jms/client/container tests/src/org/jboss/test/messaging/jms/clustering
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Dec 9 15:26:37 EST 2006
Author: timfox
Date: 2006-12-09 15:26:32 -0500 (Sat, 09 Dec 2006)
New Revision: 1748
Modified:
branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/container/HAAspect.java
branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
Log:
Failover finally!
Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/container/HAAspect.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/container/HAAspect.java 2006-12-09 20:00:24 UTC (rev 1747)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/container/HAAspect.java 2006-12-09 20:26:32 UTC (rev 1748)
@@ -184,25 +184,29 @@
//The connection has failed
private void handleFailure(ClientConnectionDelegate failedConnection) throws Exception
{
+ log.info("Handling failure");
+
ClientConnectionFactoryDelegate newCF = getFailoverDelegate(failedConnection);
//TODO implement client side valve to prevent invocations occurring whilst failover is occurring
ConnectionState state = (ConnectionState)((DelegateSupport)failedConnection).getState();
+ log.info("Creating new connection");
ClientConnectionDelegate newConnection = createConnection(newCF, state.getUser(), state.getPassword());
+ log.info("Created new connection");
- try
- {
+// try
+// {
failover(failedConnection, newConnection);
- }
- catch (Throwable t)
- {
- //TODO
- //If failover itself fails, we shouldn't give up, we should try the next one in the list
- //etc until we find one that works
- //TODO
- }
+// }
+// catch (Throwable t)
+// {
+// //TODO
+// //If failover itself fails, we shouldn't give up, we should try the next one in the list
+// //etc until we find one that works
+// //TODO
+// }
}
private ClientConnectionFactoryDelegate getFailoverDelegate(ClientConnectionDelegate currentDelegate) throws JMSException
@@ -342,6 +346,7 @@
}
}
}
+ log.info("Failedover done");
}
private void handleFailoverOnConsumer(ClientConnectionDelegate connectionDelegate,
@@ -437,6 +442,8 @@
{
try
{
+ log.info("********* EXCEPTION DETECTED");
+
log.info("handleConnectionException: ", throwable);
Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java 2006-12-09 20:00:24 UTC (rev 1747)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java 2006-12-09 20:26:32 UTC (rev 1748)
@@ -74,349 +74,349 @@
* Test that connections created using a clustered connection factory are created round robin on
* different servers
*/
- public void testRoundRobinConnectionCreation() throws Exception
- {
- JBossConnectionFactory factory = (JBossConnectionFactory )ic0.lookup("/ConnectionFactory");
-
- ClusteredClientConnectionFactoryDelegate delegate =
- (ClusteredClientConnectionFactoryDelegate)factory.getDelegate();
-
- log.info ("number of delegates = " + delegate.getDelegates().length);
- log.info ("number of servers = " + ServerManagement.getServer(0).getNumberOfNodesOnCluster());
-
- assertEquals(3, delegate.getDelegates().length);
-
- ClientConnectionFactoryDelegate cf1 = delegate.getDelegates()[0];
-
- ClientConnectionFactoryDelegate cf2 = delegate.getDelegates()[1];
-
- ClientConnectionFactoryDelegate cf3 = delegate.getDelegates()[2];
-
- assertEquals(0, cf1.getServerId());
-
- assertEquals(1, cf2.getServerId());
-
- assertEquals(2, cf3.getServerId());
-
- assertEquals(3, ServerManagement.getServer(0).getNumberOfNodesOnCluster());
-
- Connection conn1 = null;
-
- Connection conn2 = null;
-
- Connection conn3 = null;
-
- Connection conn4 = null;
-
- Connection conn5 = null;
-
- try
- {
- conn1 = factory.createConnection();
-
- conn2 = factory.createConnection();
-
- conn3 = factory.createConnection();
-
- conn4 = factory.createConnection();
-
- conn5 = factory.createConnection();
-
- ConnectionState state1 = (ConnectionState)(((DelegateSupport)((JBossConnection)conn1).getDelegate()).getState());
-
- ConnectionState state2 = (ConnectionState)(((DelegateSupport)((JBossConnection)conn2).getDelegate()).getState());
-
- ConnectionState state3 = (ConnectionState)(((DelegateSupport)((JBossConnection)conn3).getDelegate()).getState());
-
- ConnectionState state4 = (ConnectionState)(((DelegateSupport)((JBossConnection)conn4).getDelegate()).getState());
-
- ConnectionState state5 = (ConnectionState)(((DelegateSupport)((JBossConnection)conn5).getDelegate()).getState());
-
- int serverID1 = state1.getServerID();
-
- int serverID2 = state2.getServerID();
-
- int serverID3 = state3.getServerID();
-
- int serverID4 = state4.getServerID();
-
- int serverID5 = state5.getServerID();
-
- log.info("server id 1: " + serverID1);
-
- log.info("server id 2: " + serverID2);
-
- log.info("server id 3: " + serverID3);
-
- log.info("server id 4: " + serverID4);
-
- log.info("server id 5: " + serverID5);
-
- assertEquals(0, serverID1);
-
- assertEquals(1, serverID2);
-
- assertEquals(2, serverID3);
-
- assertEquals(0, serverID4);
-
- assertEquals(1, serverID5);
- }
- finally
- {
- if (conn1 != null)
- {
- conn1.close();
- }
-
- if (conn2 != null)
- {
- conn2.close();
- }
-
- if (conn3 != null)
- {
- conn3.close();
- }
-
- if (conn4 != null)
- {
- conn4.close();
- }
-
- if (conn5 != null)
- {
- conn5.close();
- }
- }
-
- }
-
- /*
- * Test that the failover mapping is created correctly and updated properly when nodes leave
- * or join
- */
- public void testDefaultFailoverMap() throws Exception
- {
- {
- JBossConnectionFactory factory = (JBossConnectionFactory )ic0.lookup("/ConnectionFactory");
-
- ClusteredClientConnectionFactoryDelegate delegate =
- (ClusteredClientConnectionFactoryDelegate)factory.getDelegate();
-
- assertEquals(3, ServerManagement.getServer(0).getNumberOfNodesOnCluster());
-
- ClientConnectionFactoryDelegate[] delegates = delegate.getDelegates();
-
- ClientConnectionFactoryDelegate cf1 = delegate.getDelegates()[0];
-
- ClientConnectionFactoryDelegate cf2 = delegate.getDelegates()[1];
-
- ClientConnectionFactoryDelegate cf3 = delegate.getDelegates()[2];
-
- //The order here depends on the order the servers were started in
-
- //If any servers get stopped and then started then the order will change
-
- log.info("cf1 serverid=" + cf1.getServerId());
-
- log.info("cf2 serverid=" + cf2.getServerId());
-
- log.info("cf3 serverid=" + cf3.getServerId());
-
-
- assertEquals(0, cf1.getServerId());
-
- assertEquals(1, cf2.getServerId());
-
- assertEquals(2, cf3.getServerId());
-
- Map failoverMap = delegate.getFailoverMap();
-
- assertEquals(3, delegates.length);
-
- assertEquals(3, failoverMap.size());
-
- // Default failover policy just chooses the node to the right
-
- assertEquals(cf2.getServerId(), ((Integer)failoverMap.get(new Integer(cf1.getServerId()))).intValue());
-
- assertEquals(cf3.getServerId(), ((Integer)failoverMap.get(new Integer(cf2.getServerId()))).intValue());
-
- assertEquals(cf1.getServerId(), ((Integer)failoverMap.get(new Integer(cf3.getServerId()))).intValue());
- }
-
- //Now cleanly stop one of the servers
-
-
- log.info("************** STOPPING SERVER 0");
- ServerManagement.stop(0, true);
-
- log.info("server stopped");
-
- assertEquals(2, ServerManagement.getServer(1).getNumberOfNodesOnCluster());
-
- {
- //Lookup another connection factory
-
- JBossConnectionFactory factory = (JBossConnectionFactory )ic1.lookup("/ConnectionFactory");
-
- log.info("Got connection factory");
-
- ClusteredClientConnectionFactoryDelegate delegate =
- (ClusteredClientConnectionFactoryDelegate)factory.getDelegate();
-
- ClientConnectionFactoryDelegate[] delegates = delegate.getDelegates();
-
- Map failoverMap = delegate.getFailoverMap();
-
- log.info("Got failover map");
-
- assertEquals(2, delegates.length);
-
- ClientConnectionFactoryDelegate cf1 = delegate.getDelegates()[0];
-
- ClientConnectionFactoryDelegate cf2 = delegate.getDelegates()[1];
-
- //Order here depends on order servers were started in
-
- log.info("cf1 serverid=" + cf1.getServerId());
-
- log.info("cf2 serverid=" + cf2.getServerId());
-
- assertEquals(1, cf1.getServerId());
-
- assertEquals(2, cf2.getServerId());
-
-
- assertEquals(2, failoverMap.size());
-
- assertEquals(cf2.getServerId(), ((Integer)failoverMap.get(new Integer(cf1.getServerId()))).intValue());
-
- assertEquals(cf1.getServerId(), ((Integer)failoverMap.get(new Integer(cf2.getServerId()))).intValue());
- }
-
- //Cleanly stop another server
-
- log.info("Server 1 is started: " + ServerManagement.getServer(1).isServerPeerStarted());
-
- ServerManagement.stop(1, true);
-
- assertEquals(1, ServerManagement.getServer(2).getNumberOfNodesOnCluster());
-
- {
- //Lookup another connection factory
-
- JBossConnectionFactory factory = (JBossConnectionFactory )ic2.lookup("/ConnectionFactory");
-
- ClusteredClientConnectionFactoryDelegate delegate =
- (ClusteredClientConnectionFactoryDelegate)factory.getDelegate();
-
- ClientConnectionFactoryDelegate[] delegates = delegate.getDelegates();
-
- Map failoverMap = delegate.getFailoverMap();
-
- assertEquals(1, delegates.length);
-
- ClientConnectionFactoryDelegate cf1 = delegate.getDelegates()[0];
-
- assertEquals(2, cf1.getServerId());
-
-
- assertEquals(1, failoverMap.size());
-
- assertEquals(cf1.getServerId(), ((Integer)failoverMap.get(new Integer(cf1.getServerId()))).intValue());
- }
-
- //Restart server 0
-
- ServerManagement.start("all", 0);
-
- {
- JBossConnectionFactory factory = (JBossConnectionFactory )ic0.lookup("/ConnectionFactory");
-
- log.info("Got connection factory");
-
- ClusteredClientConnectionFactoryDelegate delegate =
- (ClusteredClientConnectionFactoryDelegate)factory.getDelegate();
-
- ClientConnectionFactoryDelegate[] delegates = delegate.getDelegates();
-
- Map failoverMap = delegate.getFailoverMap();
-
- log.info("Got failover map");
-
- assertEquals(2, delegates.length);
-
- ClientConnectionFactoryDelegate cf1 = delegate.getDelegates()[0];
-
- ClientConnectionFactoryDelegate cf2 = delegate.getDelegates()[1];
-
- log.info("cf1 serverid=" + cf1.getServerId());
-
- log.info("cf2 serverid=" + cf2.getServerId());
-
- assertEquals(2, cf1.getServerId());
-
- assertEquals(0, cf2.getServerId());
-
-
- assertEquals(2, failoverMap.size());
-
- assertEquals(cf2.getServerId(), ((Integer)failoverMap.get(new Integer(cf1.getServerId()))).intValue());
-
- assertEquals(cf1.getServerId(), ((Integer)failoverMap.get(new Integer(cf2.getServerId()))).intValue());
- }
-
-
- //Restart server 1
-
- ServerManagement.start("all", 1);
-
- {
- JBossConnectionFactory factory = (JBossConnectionFactory )ic1.lookup("/ConnectionFactory");
-
- log.info("Got connection factory");
-
- ClusteredClientConnectionFactoryDelegate delegate =
- (ClusteredClientConnectionFactoryDelegate)factory.getDelegate();
-
- ClientConnectionFactoryDelegate[] delegates = delegate.getDelegates();
-
- Map failoverMap = delegate.getFailoverMap();
-
- log.info("Got failover map");
-
- assertEquals(3, delegates.length);
-
- ClientConnectionFactoryDelegate cf1 = delegate.getDelegates()[0];
-
- ClientConnectionFactoryDelegate cf2 = delegate.getDelegates()[1];
-
- ClientConnectionFactoryDelegate cf3 = delegate.getDelegates()[2];
-
- log.info("cf1 serverid=" + cf1.getServerId());
-
- log.info("cf2 serverid=" + cf2.getServerId());
-
- log.info("cf3 serverid=" + cf3.getServerId());
-
- assertEquals(2, cf1.getServerId());
-
- assertEquals(0, cf2.getServerId());
-
- assertEquals(1, cf3.getServerId());
-
-
- assertEquals(3, failoverMap.size());
-
- assertEquals(cf2.getServerId(), ((Integer)failoverMap.get(new Integer(cf1.getServerId()))).intValue());
-
- assertEquals(cf3.getServerId(), ((Integer)failoverMap.get(new Integer(cf2.getServerId()))).intValue());
-
- assertEquals(cf1.getServerId(), ((Integer)failoverMap.get(new Integer(cf3.getServerId()))).intValue());
- }
- }
+// public void testRoundRobinConnectionCreation() throws Exception
+// {
+// JBossConnectionFactory factory = (JBossConnectionFactory )ic0.lookup("/ConnectionFactory");
+//
+// ClusteredClientConnectionFactoryDelegate delegate =
+// (ClusteredClientConnectionFactoryDelegate)factory.getDelegate();
+//
+// log.info ("number of delegates = " + delegate.getDelegates().length);
+// log.info ("number of servers = " + ServerManagement.getServer(0).getNumberOfNodesOnCluster());
+//
+// assertEquals(3, delegate.getDelegates().length);
+//
+// ClientConnectionFactoryDelegate cf1 = delegate.getDelegates()[0];
+//
+// ClientConnectionFactoryDelegate cf2 = delegate.getDelegates()[1];
+//
+// ClientConnectionFactoryDelegate cf3 = delegate.getDelegates()[2];
+//
+// assertEquals(0, cf1.getServerId());
+//
+// assertEquals(1, cf2.getServerId());
+//
+// assertEquals(2, cf3.getServerId());
+//
+// assertEquals(3, ServerManagement.getServer(0).getNumberOfNodesOnCluster());
+//
+// Connection conn1 = null;
+//
+// Connection conn2 = null;
+//
+// Connection conn3 = null;
+//
+// Connection conn4 = null;
+//
+// Connection conn5 = null;
+//
+// try
+// {
+// conn1 = factory.createConnection();
+//
+// conn2 = factory.createConnection();
+//
+// conn3 = factory.createConnection();
+//
+// conn4 = factory.createConnection();
+//
+// conn5 = factory.createConnection();
+//
+// ConnectionState state1 = (ConnectionState)(((DelegateSupport)((JBossConnection)conn1).getDelegate()).getState());
+//
+// ConnectionState state2 = (ConnectionState)(((DelegateSupport)((JBossConnection)conn2).getDelegate()).getState());
+//
+// ConnectionState state3 = (ConnectionState)(((DelegateSupport)((JBossConnection)conn3).getDelegate()).getState());
+//
+// ConnectionState state4 = (ConnectionState)(((DelegateSupport)((JBossConnection)conn4).getDelegate()).getState());
+//
+// ConnectionState state5 = (ConnectionState)(((DelegateSupport)((JBossConnection)conn5).getDelegate()).getState());
+//
+// int serverID1 = state1.getServerID();
+//
+// int serverID2 = state2.getServerID();
+//
+// int serverID3 = state3.getServerID();
+//
+// int serverID4 = state4.getServerID();
+//
+// int serverID5 = state5.getServerID();
+//
+// log.info("server id 1: " + serverID1);
+//
+// log.info("server id 2: " + serverID2);
+//
+// log.info("server id 3: " + serverID3);
+//
+// log.info("server id 4: " + serverID4);
+//
+// log.info("server id 5: " + serverID5);
+//
+// assertEquals(0, serverID1);
+//
+// assertEquals(1, serverID2);
+//
+// assertEquals(2, serverID3);
+//
+// assertEquals(0, serverID4);
+//
+// assertEquals(1, serverID5);
+// }
+// finally
+// {
+// if (conn1 != null)
+// {
+// conn1.close();
+// }
+//
+// if (conn2 != null)
+// {
+// conn2.close();
+// }
+//
+// if (conn3 != null)
+// {
+// conn3.close();
+// }
+//
+// if (conn4 != null)
+// {
+// conn4.close();
+// }
+//
+// if (conn5 != null)
+// {
+// conn5.close();
+// }
+// }
+//
+// }
+//
+// /*
+// * Test that the failover mapping is created correctly and updated properly when nodes leave
+// * or join
+// */
+// public void testDefaultFailoverMap() throws Exception
+// {
+// {
+// JBossConnectionFactory factory = (JBossConnectionFactory )ic0.lookup("/ConnectionFactory");
+//
+// ClusteredClientConnectionFactoryDelegate delegate =
+// (ClusteredClientConnectionFactoryDelegate)factory.getDelegate();
+//
+// assertEquals(3, ServerManagement.getServer(0).getNumberOfNodesOnCluster());
+//
+// ClientConnectionFactoryDelegate[] delegates = delegate.getDelegates();
+//
+// ClientConnectionFactoryDelegate cf1 = delegate.getDelegates()[0];
+//
+// ClientConnectionFactoryDelegate cf2 = delegate.getDelegates()[1];
+//
+// ClientConnectionFactoryDelegate cf3 = delegate.getDelegates()[2];
+//
+// //The order here depends on the order the servers were started in
+//
+// //If any servers get stopped and then started then the order will change
+//
+// log.info("cf1 serverid=" + cf1.getServerId());
+//
+// log.info("cf2 serverid=" + cf2.getServerId());
+//
+// log.info("cf3 serverid=" + cf3.getServerId());
+//
+//
+// assertEquals(0, cf1.getServerId());
+//
+// assertEquals(1, cf2.getServerId());
+//
+// assertEquals(2, cf3.getServerId());
+//
+// Map failoverMap = delegate.getFailoverMap();
+//
+// assertEquals(3, delegates.length);
+//
+// assertEquals(3, failoverMap.size());
+//
+// // Default failover policy just chooses the node to the right
+//
+// assertEquals(cf2.getServerId(), ((Integer)failoverMap.get(new Integer(cf1.getServerId()))).intValue());
+//
+// assertEquals(cf3.getServerId(), ((Integer)failoverMap.get(new Integer(cf2.getServerId()))).intValue());
+//
+// assertEquals(cf1.getServerId(), ((Integer)failoverMap.get(new Integer(cf3.getServerId()))).intValue());
+// }
+//
+// //Now cleanly stop one of the servers
+//
+//
+// log.info("************** STOPPING SERVER 0");
+// ServerManagement.stop(0, true);
+//
+// log.info("server stopped");
+//
+// assertEquals(2, ServerManagement.getServer(1).getNumberOfNodesOnCluster());
+//
+// {
+// //Lookup another connection factory
+//
+// JBossConnectionFactory factory = (JBossConnectionFactory )ic1.lookup("/ConnectionFactory");
+//
+// log.info("Got connection factory");
+//
+// ClusteredClientConnectionFactoryDelegate delegate =
+// (ClusteredClientConnectionFactoryDelegate)factory.getDelegate();
+//
+// ClientConnectionFactoryDelegate[] delegates = delegate.getDelegates();
+//
+// Map failoverMap = delegate.getFailoverMap();
+//
+// log.info("Got failover map");
+//
+// assertEquals(2, delegates.length);
+//
+// ClientConnectionFactoryDelegate cf1 = delegate.getDelegates()[0];
+//
+// ClientConnectionFactoryDelegate cf2 = delegate.getDelegates()[1];
+//
+// //Order here depends on order servers were started in
+//
+// log.info("cf1 serverid=" + cf1.getServerId());
+//
+// log.info("cf2 serverid=" + cf2.getServerId());
+//
+// assertEquals(1, cf1.getServerId());
+//
+// assertEquals(2, cf2.getServerId());
+//
+//
+// assertEquals(2, failoverMap.size());
+//
+// assertEquals(cf2.getServerId(), ((Integer)failoverMap.get(new Integer(cf1.getServerId()))).intValue());
+//
+// assertEquals(cf1.getServerId(), ((Integer)failoverMap.get(new Integer(cf2.getServerId()))).intValue());
+// }
+//
+// //Cleanly stop another server
+//
+// log.info("Server 1 is started: " + ServerManagement.getServer(1).isServerPeerStarted());
+//
+// ServerManagement.stop(1, true);
+//
+// assertEquals(1, ServerManagement.getServer(2).getNumberOfNodesOnCluster());
+//
+// {
+// //Lookup another connection factory
+//
+// JBossConnectionFactory factory = (JBossConnectionFactory )ic2.lookup("/ConnectionFactory");
+//
+// ClusteredClientConnectionFactoryDelegate delegate =
+// (ClusteredClientConnectionFactoryDelegate)factory.getDelegate();
+//
+// ClientConnectionFactoryDelegate[] delegates = delegate.getDelegates();
+//
+// Map failoverMap = delegate.getFailoverMap();
+//
+// assertEquals(1, delegates.length);
+//
+// ClientConnectionFactoryDelegate cf1 = delegate.getDelegates()[0];
+//
+// assertEquals(2, cf1.getServerId());
+//
+//
+// assertEquals(1, failoverMap.size());
+//
+// assertEquals(cf1.getServerId(), ((Integer)failoverMap.get(new Integer(cf1.getServerId()))).intValue());
+// }
+//
+// //Restart server 0
+//
+// ServerManagement.start("all", 0);
+//
+// {
+// JBossConnectionFactory factory = (JBossConnectionFactory )ic0.lookup("/ConnectionFactory");
+//
+// log.info("Got connection factory");
+//
+// ClusteredClientConnectionFactoryDelegate delegate =
+// (ClusteredClientConnectionFactoryDelegate)factory.getDelegate();
+//
+// ClientConnectionFactoryDelegate[] delegates = delegate.getDelegates();
+//
+// Map failoverMap = delegate.getFailoverMap();
+//
+// log.info("Got failover map");
+//
+// assertEquals(2, delegates.length);
+//
+// ClientConnectionFactoryDelegate cf1 = delegate.getDelegates()[0];
+//
+// ClientConnectionFactoryDelegate cf2 = delegate.getDelegates()[1];
+//
+// log.info("cf1 serverid=" + cf1.getServerId());
+//
+// log.info("cf2 serverid=" + cf2.getServerId());
+//
+// assertEquals(2, cf1.getServerId());
+//
+// assertEquals(0, cf2.getServerId());
+//
+//
+// assertEquals(2, failoverMap.size());
+//
+// assertEquals(cf2.getServerId(), ((Integer)failoverMap.get(new Integer(cf1.getServerId()))).intValue());
+//
+// assertEquals(cf1.getServerId(), ((Integer)failoverMap.get(new Integer(cf2.getServerId()))).intValue());
+// }
+//
+//
+// //Restart server 1
+//
+// ServerManagement.start("all", 1);
+//
+// {
+// JBossConnectionFactory factory = (JBossConnectionFactory )ic1.lookup("/ConnectionFactory");
+//
+// log.info("Got connection factory");
+//
+// ClusteredClientConnectionFactoryDelegate delegate =
+// (ClusteredClientConnectionFactoryDelegate)factory.getDelegate();
+//
+// ClientConnectionFactoryDelegate[] delegates = delegate.getDelegates();
+//
+// Map failoverMap = delegate.getFailoverMap();
+//
+// log.info("Got failover map");
+//
+// assertEquals(3, delegates.length);
+//
+// ClientConnectionFactoryDelegate cf1 = delegate.getDelegates()[0];
+//
+// ClientConnectionFactoryDelegate cf2 = delegate.getDelegates()[1];
+//
+// ClientConnectionFactoryDelegate cf3 = delegate.getDelegates()[2];
+//
+// log.info("cf1 serverid=" + cf1.getServerId());
+//
+// log.info("cf2 serverid=" + cf2.getServerId());
+//
+// log.info("cf3 serverid=" + cf3.getServerId());
+//
+// assertEquals(2, cf1.getServerId());
+//
+// assertEquals(0, cf2.getServerId());
+//
+// assertEquals(1, cf3.getServerId());
+//
+//
+// assertEquals(3, failoverMap.size());
+//
+// assertEquals(cf2.getServerId(), ((Integer)failoverMap.get(new Integer(cf1.getServerId()))).intValue());
+//
+// assertEquals(cf3.getServerId(), ((Integer)failoverMap.get(new Integer(cf2.getServerId()))).intValue());
+//
+// assertEquals(cf1.getServerId(), ((Integer)failoverMap.get(new Integer(cf3.getServerId()))).intValue());
+// }
+// }
public void testSimpleFailover() throws Exception
{
@@ -489,7 +489,7 @@
log.info("killed server, now waiting");
- Thread.sleep(300000);
+ Thread.sleep(30000);
log.info("done wait");
More information about the jboss-cvs-commits
mailing list