[hornetq-commits] JBoss hornetq SVN: r9778 - branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Oct 12 10:52:14 EDT 2010
Author: jmesnil
Date: 2010-10-12 10:52:13 -0400 (Tue, 12 Oct 2010)
New Revision: 9778
Modified:
branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java
branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/RemoteMultipleLivesMultipleBackupsFailoverTest.java
Log:
fix test setup
Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java 2010-10-12 08:54:25 UTC (rev 9777)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java 2010-10-12 14:52:13 UTC (rev 9778)
@@ -22,6 +22,7 @@
import org.hornetq.api.core.client.ClientSession;
import org.hornetq.api.core.client.ServerLocator;
import org.hornetq.core.client.impl.ClientSessionFactoryInternal;
+import org.hornetq.core.client.impl.ServerLocatorInternal;
import org.hornetq.core.config.BackupConnectorConfiguration;
import org.hornetq.core.config.ClusterConnectionConfiguration;
import org.hornetq.core.config.Configuration;
@@ -56,12 +57,12 @@
public void testMultipleFailovers2LiveServers() throws Exception
{
- createLiveConfig(0, 3);
- createBackupConfig(0, 1, true, 0, 3);
- createBackupConfig(0, 2, true, 0, 3);
+ createLiveConfig(0, 3, 4, 5);
+ createBackupConfig(0, 1, true, new int[] {0, 2}, 3, 4, 5);
+ createBackupConfig(0, 2, true, new int[] {0, 1}, 3, 4, 5);
createLiveConfig(3, 0);
- createBackupConfig(3, 4, true, 0, 3, 1, 4);
- createBackupConfig(3, 5, true, 0, 3, 1, 4);
+ createBackupConfig(3, 4, true, new int[] {3, 5}, 0, 1, 2);
+ createBackupConfig(3, 5, true, new int[] {3, 4}, 0, 1, 2);
servers.get(0).start();
servers.get(3).start();
servers.get(1).start();
@@ -77,6 +78,7 @@
ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 4);
ClientSession session = sendAndConsume(sf, true);
+ System.out.println(((ServerLocatorInternal)locator).getTopology().describe());
servers.get(0).crash(session);
int liveAfter0 = waitForBackup(10000, servers, 1, 2);
@@ -116,7 +118,7 @@
}
}
- protected void createBackupConfig(int liveNode, int nodeid, boolean createClusterConnections, int... nodes)
+ protected void createBackupConfig(int liveNode, int nodeid, boolean createClusterConnections, int[] otherBackupNodes, int... otherClusterNodes)
{
Configuration config1 = super.createDefaultConfig();
config1.getAcceptorConfigurations().clear();
@@ -125,23 +127,28 @@
config1.setSharedStore(true);
config1.setBackup(true);
config1.setClustered(true);
+
List<String> staticConnectors = new ArrayList<String>();
-
- for (int node : nodes)
+ for (int node : otherBackupNodes)
{
TransportConfiguration liveConnector = createTransportConfiguration(isNetty(), false, generateParams(node, isNetty()));
config1.getConnectorConfigurations().put(liveConnector.getName(), liveConnector);
staticConnectors.add(liveConnector.getName());
}
TransportConfiguration backupConnector = createTransportConfiguration(isNetty(), false, generateParams(nodeid, isNetty()));
- List<String> pairs = null;
- ClusterConnectionConfiguration ccc1 = new ClusterConnectionConfiguration("cluster1", "jms", backupConnector.getName(), -1, false, false, 1, 1,
- createClusterConnections? staticConnectors:pairs);
- config1.getClusterConfigurations().add(ccc1);
BackupConnectorConfiguration connectorConfiguration = new BackupConnectorConfiguration(staticConnectors, backupConnector.getName());
config1.setBackupConnectorConfiguration(connectorConfiguration);
config1.getConnectorConfigurations().put(backupConnector.getName(), backupConnector);
+ List<String> clusterNodes = new ArrayList<String>();
+ for (int node : otherClusterNodes)
+ {
+ TransportConfiguration connector = createTransportConfiguration(isNetty(), false, generateParams(node, isNetty()));
+ config1.getConnectorConfigurations().put(connector.getName(), connector);
+ clusterNodes.add(connector.getName());
+ }
+ ClusterConnectionConfiguration ccc1 = new ClusterConnectionConfiguration("cluster1", "jms", backupConnector.getName(), -1, false, false, 1, 1, clusterNodes);
+ config1.getClusterConfigurations().add(ccc1);
config1.setBindingsDirectory(config1.getBindingsDirectory() + "_" + liveNode);
config1.setJournalDirectory(config1.getJournalDirectory() + "_" + liveNode);
Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/RemoteMultipleLivesMultipleBackupsFailoverTest.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/RemoteMultipleLivesMultipleBackupsFailoverTest.java 2010-10-12 08:54:25 UTC (rev 9777)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/RemoteMultipleLivesMultipleBackupsFailoverTest.java 2010-10-12 14:52:13 UTC (rev 9778)
@@ -79,8 +79,13 @@
servers.put(liveNode, new RemoteProcessHornetQServer(lives.get(liveNode)));
}
+
@Override
- protected void createBackupConfig(int liveNode, int nodeid, boolean createClusterConnections, int... nodes)
+ protected void createBackupConfig(int liveNode,
+ int nodeid,
+ boolean createClusterConnections,
+ int[] otherBackupNodes,
+ int... otherClusterNodes)
{
servers.put(nodeid, new RemoteProcessHornetQServer(backups.get(nodeid)));
}
@@ -94,7 +99,7 @@
@Override
public Configuration getConfiguration()
{
- return createLiveConfiguration(0, 3);
+ return createLiveConfiguration(0, 3, 4, 5);
}
}
@@ -103,7 +108,7 @@
@Override
public Configuration getConfiguration()
{
- return createLiveConfiguration(3, 0);
+ return createLiveConfiguration(3, 0, 1, 2);
}
}
@@ -112,7 +117,7 @@
@Override
public Configuration getConfiguration()
{
- return createBackupConfiguration(0, 1, true, 0, 3);
+ return createBackupConfiguration(0, 1, true, new int[] {0, 2}, 3, 4, 5);
}
}
@@ -121,7 +126,7 @@
@Override
public Configuration getConfiguration()
{
- return createBackupConfiguration(0, 2, true, 0, 3);
+ return createBackupConfiguration(0, 2, true, new int[] {0, 1}, 3, 4, 5);
}
}
@@ -130,7 +135,7 @@
@Override
public Configuration getConfiguration()
{
- return createBackupConfiguration(3, 4, true, 0, 3);
+ return createBackupConfiguration(3, 4, true, new int[] {3, 5}, 0, 1, 2);
}
}
@@ -139,11 +144,11 @@
@Override
public Configuration getConfiguration()
{
- return createBackupConfiguration(3, 5, true, 0, 3);
+ return createBackupConfiguration(3, 5, true, new int[] {3, 4}, 0, 1, 2);
}
}
- protected static Configuration createBackupConfiguration(int liveNode, int nodeid, boolean createClusterConnections, int... nodes)
+ protected static Configuration createBackupConfiguration(int liveNode, int nodeid, boolean createClusterConnections, int[] otherBackupNodes, int... otherClusterNodes)
{
Configuration config1 = new ConfigurationImpl();
config1.getAcceptorConfigurations().add(createTransportConfiguration(true, true, generateParams(nodeid, true)));
@@ -152,24 +157,31 @@
config1.setBackup(true);
config1.setJournalType(JournalType.NIO);
config1.setClustered(true);
+
List<String> staticConnectors = new ArrayList<String>();
-
- for (int node : nodes)
+ for (int node : otherBackupNodes)
{
TransportConfiguration liveConnector = createTransportConfiguration(true, false, generateParams(node, true));
config1.getConnectorConfigurations().put(liveConnector.getName(), liveConnector);
staticConnectors.add(liveConnector.getName());
}
TransportConfiguration backupConnector = createTransportConfiguration(true, false, generateParams(nodeid, true));
- List<String> pairs = null;
- ClusterConnectionConfiguration ccc1 = new ClusterConnectionConfiguration("cluster1", "jms", backupConnector.getName(), -1, false, false, 1, 1,
- createClusterConnections? staticConnectors:pairs);
- config1.getClusterConfigurations().add(ccc1);
BackupConnectorConfiguration connectorConfiguration = new BackupConnectorConfiguration(staticConnectors, backupConnector.getName());
config1.setBackupConnectorConfiguration(connectorConfiguration);
config1.getConnectorConfigurations().put(backupConnector.getName(), backupConnector);
+ List<String> clusterNodes = new ArrayList<String>();
+ for (int node : otherClusterNodes)
+ {
+ TransportConfiguration connector = createTransportConfiguration(true, false, generateParams(node, true));
+ config1.getConnectorConfigurations().put(connector.getName(), connector);
+ clusterNodes.add(connector.getName());
+ }
+ ClusterConnectionConfiguration ccc1 = new ClusterConnectionConfiguration("cluster1", "jms", backupConnector.getName(), -1, false, false, 1, 1, clusterNodes);
+ config1.getClusterConfigurations().add(ccc1);
+
+
config1.setBindingsDirectory(config1.getBindingsDirectory() + "_" + liveNode);
config1.setJournalDirectory(config1.getJournalDirectory() + "_" + liveNode);
config1.setPagingDirectory(config1.getPagingDirectory() + "_" + liveNode);
More information about the hornetq-commits
mailing list