[jboss-cvs] JBoss Messaging SVN: r6148 - in trunk: src/main/org/jboss/messaging/core/remoting/impl and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 24 08:07:56 EDT 2009
Author: timfox
Date: 2009-03-24 08:07:56 -0400 (Tue, 24 Mar 2009)
New Revision: 6148
Modified:
trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/NettySymmetricClusterTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/SymmetricClusterTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/SymmetricClusterTestWithBackup.java
Log:
reinstate andy's connection unblocking fix plus uncomment some tests etc
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java 2009-03-24 10:22:17 UTC (rev 6147)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java 2009-03-24 12:07:56 UTC (rev 6148)
@@ -200,7 +200,7 @@
this.initialConnectAttempts = initialConnectAttempts;
- this.reconnectAttempts = reconnectAttempts;
+ this.reconnectAttempts = reconnectAttempts;
}
// ConnectionLifeCycleListener implementation --------------------
@@ -431,9 +431,9 @@
}
private boolean handleConnectionFailed(final MessagingException me, final Object connectionID)
- {
+ {
boolean callNext = !failoverOrReconnect(me, connectionID);
-
+
return callNext;
}
@@ -573,7 +573,7 @@
{
connectAttempts = backupConnectorFactory == null ? reconnectAttempts : 0;
}
-
+
if (backupConnectorFactory != null || connectAttempts != 0)
{
lockAllChannel1s();
@@ -638,7 +638,7 @@
else
{
// Now try failing over to backup
-
+
connectorFactory = backupConnectorFactory;
transportParams = backupTransportParams;
@@ -778,8 +778,6 @@
{
if (closed)
{
- log.warn("ConnectionManager is now closed");
-
return null;
}
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java 2009-03-24 10:22:17 UTC (rev 6147)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java 2009-03-24 12:07:56 UTC (rev 6148)
@@ -438,6 +438,19 @@
callListeners(me);
internalClose();
+
+ for (ChannelImpl channel : channels.values())
+ {
+ channel.lock.lock();
+ try
+ {
+ channel.sendCondition.signalAll();
+ }
+ finally
+ {
+ channel.lock.unlock();
+ }
+ }
}
public void destroy()
@@ -503,7 +516,7 @@
if (!frozen)
{
final ChannelImpl channel = channels.get(packet.getChannelID());
-
+
if (channel != null)
{
channel.handlePacket(packet);
@@ -1126,6 +1139,11 @@
{
}
+ if (closed)
+ {
+ break;
+ }
+
final long now = System.currentTimeMillis();
toWait -= now - start;
@@ -1631,7 +1649,7 @@
long connectionTTLToUse = connectionTTL != -1 ? connectionTTL : ((Ping)packet).getExpirePeriod();
expireTime = System.currentTimeMillis() + connectionTTLToUse;
-
+
// Parameter is placeholder for future
final Packet pong = new Pong(-1);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java 2009-03-24 10:22:17 UTC (rev 6147)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java 2009-03-24 12:07:56 UTC (rev 6148)
@@ -149,11 +149,11 @@
{
messageCount = getMessageCount(po, address);
- log.info(node + " messageCount " + messageCount);
+ // log.info(node + " messageCount " + messageCount);
if (messageCount == count)
{
- log.info("Waited " + (System.currentTimeMillis() - start));
+ //log.info("Waited " + (System.currentTimeMillis() - start));
return;
}
@@ -174,15 +174,15 @@
final int consumerCount,
final boolean local) throws Exception
{
- log.info("waiting for bindings on node " + node +
- " address " +
- address +
- " count " +
- count +
- " consumerCount " +
- consumerCount +
- " local " +
- local);
+// log.info("waiting for bindings on node " + node +
+// " address " +
+// address +
+// " count " +
+// count +
+// " consumerCount " +
+// consumerCount +
+// " local " +
+// local);
MessagingService service = this.services[node];
if (service == null)
@@ -218,7 +218,7 @@
}
}
- log.info(node + " binding count " + bindingCount + " consumer Count " + totConsumers);
+ // log.info(node + " binding count " + bindingCount + " consumer Count " + totConsumers);
if (bindingCount == count && totConsumers == consumerCount)
{
@@ -848,8 +848,6 @@
configuration.setClustered(true);
configuration.setBackup(backup);
- log.info("setting up server " + node + " backup " + backup);
-
if (backupNode != -1)
{
Map<String, Object> backupParams = generateParams(backupNode, netty);
@@ -1033,8 +1031,6 @@
serviceFrom.getServer().getConfiguration().getConnectorConfigurations().put(serverTotc.getName(), serverTotc);
- // serviceFrom.getServer().getConfiguration().setConnectorConfigurations(connectors);
-
Pair<String, String> connectorPair = new Pair<String, String>(serverTotc.getName(), null);
List<Pair<String, String>> pairs = new ArrayList<Pair<String, String>>();
@@ -1138,8 +1134,6 @@
List<Pair<String, String>> pairs = new ArrayList<Pair<String, String>>();
- log.info("creating cluster connection from node " + nodeFrom);
-
for (int i = 0; i < nodesTo.length; i++)
{
Map<String, Object> params = generateParams(nodesTo[i], netty);
@@ -1155,8 +1149,6 @@
serverTotc = new TransportConfiguration(INVM_CONNECTOR_FACTORY, params);
}
- log.info("to " + nodesTo[i]);
-
connectors.put(serverTotc.getName(), serverTotc);
Pair<String, String> connectorPair = new Pair<String, String>(serverTotc.getName(), null);
@@ -1200,8 +1192,6 @@
List<Pair<String, String>> pairs = new ArrayList<Pair<String, String>>();
- log.info("creating cluster connection from node " + nodeFrom);
-
for (int i = 0; i < nodesTo.length; i++)
{
Map<String, Object> params = generateParams(nodesTo[i], netty);
@@ -1217,8 +1207,6 @@
serverTotc = new TransportConfiguration(INVM_CONNECTOR_FACTORY, params);
}
- log.info("to " + nodesTo[i]);
-
connectors.put(serverTotc.getName(), serverTotc);
Map<String, Object> backupParams = generateParams(backupsTo[i], netty);
@@ -1306,13 +1294,11 @@
for (int i = 0; i < nodes.length; i++)
{
if (services[nodes[i]].isStarted())
- {
- log.info("stopping cluster connections on node " + nodes[i]);
+ {
for (ClusterConnection cc : services[nodes[i]].getServer().getClusterManager().getClusterConnections())
{
cc.stop();
}
- log.info("stopped");
}
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/NettySymmetricClusterTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/NettySymmetricClusterTest.java 2009-03-24 10:22:17 UTC (rev 6147)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/NettySymmetricClusterTest.java 2009-03-24 12:07:56 UTC (rev 6148)
@@ -43,5 +43,4 @@
{
return false;
}
-
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/SymmetricClusterTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/SymmetricClusterTest.java 2009-03-24 10:22:17 UTC (rev 6147)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/SymmetricClusterTest.java 2009-03-24 12:07:56 UTC (rev 6148)
@@ -64,103 +64,100 @@
{
return false;
}
+
+ public void testStopAllStartAll() throws Exception
+ {
+ setupCluster();
+
+ startServers();
+
+ setupSessionFactory(0, isNetty());
+ setupSessionFactory(1, isNetty());
+ setupSessionFactory(2, isNetty());
+ setupSessionFactory(3, isNetty());
+ setupSessionFactory(4, isNetty());
+
+ createQueue(0, "queues.testaddress", "queue0", null, false);
+ createQueue(1, "queues.testaddress", "queue0", null, false);
+ createQueue(2, "queues.testaddress", "queue0", null, false);
+ createQueue(3, "queues.testaddress", "queue0", null, false);
+ createQueue(4, "queues.testaddress", "queue0", null, false);
+
+ addConsumer(0, 0, "queue0", null);
+ addConsumer(1, 1, "queue0", null);
+ addConsumer(2, 2, "queue0", null);
+ addConsumer(3, 3, "queue0", null);
+ addConsumer(4, 4, "queue0", null);
+
+ waitForBindings(0, "queues.testaddress", 1, 1, true);
+ waitForBindings(1, "queues.testaddress", 1, 1, true);
+ waitForBindings(2, "queues.testaddress", 1, 1, true);
+ waitForBindings(3, "queues.testaddress", 1, 1, true);
+ waitForBindings(4, "queues.testaddress", 1, 1, true);
+
+ waitForBindings(0, "queues.testaddress", 4, 4, false);
+ waitForBindings(1, "queues.testaddress", 4, 4, false);
+ waitForBindings(2, "queues.testaddress", 4, 4, false);
+ waitForBindings(3, "queues.testaddress", 4, 4, false);
+ waitForBindings(4, "queues.testaddress", 4, 4, false);
+
+ send(0, "queues.testaddress", 10, false, null);
+
+ verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2, 3, 4);
+
+ this.verifyNotReceive(0, 1, 2, 3, 4);
+
+ this.removeConsumer(0);
+ this.removeConsumer(1);
+ this.removeConsumer(2);
+ this.removeConsumer(3);
+ this.removeConsumer(4);
+
+ this.closeAllSessionFactories();
+
+ stopServers(0, 1, 2, 3, 4);
+
+ startServers();
+
+ setupSessionFactory(0, isNetty());
+ setupSessionFactory(1, isNetty());
+ setupSessionFactory(2, isNetty());
+ setupSessionFactory(3, isNetty());
+ setupSessionFactory(4, isNetty());
+
+ createQueue(0, "queues.testaddress", "queue0", null, false);
+ createQueue(1, "queues.testaddress", "queue0", null, false);
+ createQueue(2, "queues.testaddress", "queue0", null, false);
+ createQueue(3, "queues.testaddress", "queue0", null, false);
+ createQueue(4, "queues.testaddress", "queue0", null, false);
+
+ addConsumer(0, 0, "queue0", null);
+ addConsumer(1, 1, "queue0", null);
+ addConsumer(2, 2, "queue0", null);
+ addConsumer(3, 3, "queue0", null);
+ addConsumer(4, 4, "queue0", null);
+
+ waitForBindings(0, "queues.testaddress", 1, 1, true);
+ waitForBindings(1, "queues.testaddress", 1, 1, true);
+ waitForBindings(2, "queues.testaddress", 1, 1, true);
+ waitForBindings(3, "queues.testaddress", 1, 1, true);
+ waitForBindings(4, "queues.testaddress", 1, 1, true);
+
+ waitForBindings(0, "queues.testaddress", 4, 4, false);
+ waitForBindings(1, "queues.testaddress", 4, 4, false);
+ waitForBindings(2, "queues.testaddress", 4, 4, false);
+ waitForBindings(3, "queues.testaddress", 4, 4, false);
+ waitForBindings(4, "queues.testaddress", 4, 4, false);
+
+ send(0, "queues.testaddress", 10, false, null);
+
+ verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2, 3, 4);
+
+ this.verifyNotReceive(0, 1, 2, 3, 4);
+
+ log.info("got here");
+ }
-// Temporarily commented out
-// public void testStopAllStartAll() throws Exception
-// {
-// setupCluster();
-//
-// startServers();
-//
-// setupSessionFactory(0, isNetty());
-// setupSessionFactory(1, isNetty());
-// setupSessionFactory(2, isNetty());
-// setupSessionFactory(3, isNetty());
-// setupSessionFactory(4, isNetty());
-//
-// createQueue(0, "queues.testaddress", "queue0", null, false);
-// createQueue(1, "queues.testaddress", "queue0", null, false);
-// createQueue(2, "queues.testaddress", "queue0", null, false);
-// createQueue(3, "queues.testaddress", "queue0", null, false);
-// createQueue(4, "queues.testaddress", "queue0", null, false);
-//
-// addConsumer(0, 0, "queue0", null);
-// addConsumer(1, 1, "queue0", null);
-// addConsumer(2, 2, "queue0", null);
-// addConsumer(3, 3, "queue0", null);
-// addConsumer(4, 4, "queue0", null);
-//
-// waitForBindings(0, "queues.testaddress", 1, 1, true);
-// waitForBindings(1, "queues.testaddress", 1, 1, true);
-// waitForBindings(2, "queues.testaddress", 1, 1, true);
-// waitForBindings(3, "queues.testaddress", 1, 1, true);
-// waitForBindings(4, "queues.testaddress", 1, 1, true);
-//
-// waitForBindings(0, "queues.testaddress", 4, 4, false);
-// waitForBindings(1, "queues.testaddress", 4, 4, false);
-// waitForBindings(2, "queues.testaddress", 4, 4, false);
-// waitForBindings(3, "queues.testaddress", 4, 4, false);
-// waitForBindings(4, "queues.testaddress", 4, 4, false);
-//
-// send(0, "queues.testaddress", 10, false, null);
-//
-// verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2, 3, 4);
-//
-// this.verifyNotReceive(0, 1, 2, 3, 4);
-//
-// this.removeConsumer(0);
-// this.removeConsumer(1);
-// this.removeConsumer(2);
-// this.removeConsumer(3);
-// this.removeConsumer(4);
-//
-// this.closeAllSessionFactories();
-//
-// log.info("**** stopping servers");
-// stopServers(0, 1, 2, 3, 4);
-//
-// log.info("** restarting servers");
-// startServers();
-//
-// setupSessionFactory(0, isNetty());
-// setupSessionFactory(1, isNetty());
-// setupSessionFactory(2, isNetty());
-// setupSessionFactory(3, isNetty());
-// setupSessionFactory(4, isNetty());
-//
-// createQueue(0, "queues.testaddress", "queue0", null, false);
-// createQueue(1, "queues.testaddress", "queue0", null, false);
-// createQueue(2, "queues.testaddress", "queue0", null, false);
-// createQueue(3, "queues.testaddress", "queue0", null, false);
-// createQueue(4, "queues.testaddress", "queue0", null, false);
-//
-// addConsumer(0, 0, "queue0", null);
-// addConsumer(1, 1, "queue0", null);
-// addConsumer(2, 2, "queue0", null);
-// addConsumer(3, 3, "queue0", null);
-// addConsumer(4, 4, "queue0", null);
-//
-// waitForBindings(0, "queues.testaddress", 1, 1, true);
-// waitForBindings(1, "queues.testaddress", 1, 1, true);
-// waitForBindings(2, "queues.testaddress", 1, 1, true);
-// waitForBindings(3, "queues.testaddress", 1, 1, true);
-// waitForBindings(4, "queues.testaddress", 1, 1, true);
-//
-// waitForBindings(0, "queues.testaddress", 4, 4, false);
-// waitForBindings(1, "queues.testaddress", 4, 4, false);
-// waitForBindings(2, "queues.testaddress", 4, 4, false);
-// waitForBindings(3, "queues.testaddress", 4, 4, false);
-// waitForBindings(4, "queues.testaddress", 4, 4, false);
-//
-// send(0, "queues.testaddress", 10, false, null);
-//
-// verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2, 3, 4);
-//
-// this.verifyNotReceive(0, 1, 2, 3, 4);
-//
-// log.info("got here");
-// }
-
public void testBasicRoundRobin() throws Exception
{
setupCluster();
@@ -1299,195 +1296,195 @@
verifyReceiveRoundRobinInSomeOrder(10, 1, 2, 3, 4);
}
-// public void testStartStopServers() throws Exception
-// {
-// setupCluster();
-//
-// startServers();
-//
-// setupSessionFactory(0, isNetty());
-// setupSessionFactory(1, isNetty());
-// setupSessionFactory(2, isNetty());
-// setupSessionFactory(3, isNetty());
-// setupSessionFactory(4, isNetty());
-//
-// createQueue(0, "queues.testaddress", "queue0", null, false);
-// createQueue(1, "queues.testaddress", "queue1", null, false);
-// createQueue(2, "queues.testaddress", "queue2", null, false);
-// createQueue(3, "queues.testaddress", "queue3", null, false);
-// createQueue(4, "queues.testaddress", "queue4", null, false);
-//
-// createQueue(0, "queues.testaddress", "queue5", null, false);
-// createQueue(1, "queues.testaddress", "queue6", null, false);
-// createQueue(2, "queues.testaddress", "queue7", null, false);
-// createQueue(3, "queues.testaddress", "queue8", null, false);
-// createQueue(4, "queues.testaddress", "queue9", null, false);
-//
-// createQueue(0, "queues.testaddress", "queue10", null, false);
-// createQueue(1, "queues.testaddress", "queue11", null, false);
-// createQueue(2, "queues.testaddress", "queue12", null, false);
-// createQueue(3, "queues.testaddress", "queue13", null, false);
-// createQueue(4, "queues.testaddress", "queue14", null, false);
-//
-// createQueue(0, "queues.testaddress", "queue15", null, false);
-// createQueue(1, "queues.testaddress", "queue15", null, false);
-// createQueue(2, "queues.testaddress", "queue15", null, false);
-// createQueue(3, "queues.testaddress", "queue15", null, false);
-// createQueue(4, "queues.testaddress", "queue15", null, false);
-//
-// createQueue(2, "queues.testaddress", "queue16", null, false);
-// createQueue(3, "queues.testaddress", "queue16", null, false);
-// createQueue(4, "queues.testaddress", "queue16", null, false);
-//
-// createQueue(0, "queues.testaddress", "queue17", null, false);
-// createQueue(1, "queues.testaddress", "queue17", null, false);
-// createQueue(4, "queues.testaddress", "queue17", null, false);
-//
-// createQueue(3, "queues.testaddress", "queue18", null, false);
-// createQueue(4, "queues.testaddress", "queue18", null, false);
-//
-// addConsumer(0, 0, "queue0", null);
-// addConsumer(1, 1, "queue1", null);
-// addConsumer(2, 2, "queue2", null);
-// addConsumer(3, 3, "queue3", null);
-// addConsumer(4, 4, "queue4", null);
-//
-// addConsumer(5, 0, "queue5", null);
-// addConsumer(6, 1, "queue6", null);
-// addConsumer(7, 2, "queue7", null);
-// addConsumer(8, 3, "queue8", null);
-// addConsumer(9, 4, "queue9", null);
-//
-// addConsumer(10, 0, "queue10", null);
-// addConsumer(11, 1, "queue11", null);
-// addConsumer(12, 2, "queue12", null);
-// addConsumer(13, 3, "queue13", null);
-// addConsumer(14, 4, "queue14", null);
-//
-// addConsumer(15, 0, "queue15", null);
-// addConsumer(16, 1, "queue15", null);
-// addConsumer(17, 2, "queue15", null);
-// addConsumer(18, 3, "queue15", null);
-// addConsumer(19, 4, "queue15", null);
-//
-// addConsumer(20, 2, "queue16", null);
-// addConsumer(21, 3, "queue16", null);
-// addConsumer(22, 4, "queue16", null);
-//
-// addConsumer(23, 0, "queue17", null);
-// addConsumer(24, 1, "queue17", null);
-// addConsumer(25, 4, "queue17", null);
-//
-// addConsumer(26, 3, "queue18", null);
-// addConsumer(27, 4, "queue18", null);
-//
-// waitForBindings(0, "queues.testaddress", 5, 5, true);
-// waitForBindings(1, "queues.testaddress", 5, 5, true);
-// waitForBindings(2, "queues.testaddress", 5, 5, true);
-// waitForBindings(3, "queues.testaddress", 6, 6, true);
-// waitForBindings(4, "queues.testaddress", 7, 7, true);
-//
-// waitForBindings(0, "queues.testaddress", 23, 23, false);
-// waitForBindings(1, "queues.testaddress", 23, 23, false);
-// waitForBindings(2, "queues.testaddress", 23, 23, false);
-// waitForBindings(3, "queues.testaddress", 22, 22, false);
-// waitForBindings(4, "queues.testaddress", 21, 21, false);
-//
-// send(0, "queues.testaddress", 10, false, null);
-//
-// verifyReceiveAll(10, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14);
-//
-// verifyReceiveRoundRobinInSomeOrder(10, 15, 16, 17, 18, 19);
-//
-// verifyReceiveRoundRobinInSomeOrder(10, 20, 21, 22);
-//
-// verifyReceiveRoundRobinInSomeOrder(10, 23, 24, 25);
-//
-// verifyReceiveRoundRobinInSomeOrder(10, 26, 27);
-//
-// removeConsumer(0);
-// removeConsumer(5);
-// removeConsumer(10);
-// removeConsumer(15);
-// removeConsumer(23);
-// removeConsumer(3);
-// removeConsumer(8);
-// removeConsumer(13);
-// removeConsumer(18);
-// removeConsumer(21);
-// removeConsumer(26);
-//
-// closeSessionFactory(0);
-// closeSessionFactory(3);
-//
-// stopServers(0, 3);
-//
-// startServers(3, 0);
-//
-// setupSessionFactory(0, isNetty());
-// setupSessionFactory(3, isNetty());
-//
-// createQueue(0, "queues.testaddress", "queue0", null, false);
-// createQueue(3, "queues.testaddress", "queue3", null, false);
-//
-// createQueue(0, "queues.testaddress", "queue5", null, false);
-// createQueue(3, "queues.testaddress", "queue8", null, false);
-//
-// createQueue(0, "queues.testaddress", "queue10", null, false);
-// createQueue(3, "queues.testaddress", "queue13", null, false);
-//
-// createQueue(0, "queues.testaddress", "queue15", null, false);
-// createQueue(3, "queues.testaddress", "queue15", null, false);
-//
-// createQueue(3, "queues.testaddress", "queue16", null, false);
-//
-// createQueue(0, "queues.testaddress", "queue17", null, false);
-//
-// createQueue(3, "queues.testaddress", "queue18", null, false);
-//
-// addConsumer(0, 0, "queue0", null);
-// addConsumer(3, 3, "queue3", null);
-//
-// addConsumer(5, 0, "queue5", null);
-// addConsumer(8, 3, "queue8", null);
-//
-// addConsumer(10, 0, "queue10", null);
-// addConsumer(13, 3, "queue13", null);
-//
-// addConsumer(15, 0, "queue15", null);
-// addConsumer(18, 3, "queue15", null);
-//
-// addConsumer(21, 3, "queue16", null);
-//
-// addConsumer(23, 0, "queue17", null);
-//
-// addConsumer(26, 3, "queue18", null);
-//
-// waitForBindings(0, "queues.testaddress", 5, 5, true);
-// waitForBindings(1, "queues.testaddress", 5, 5, true);
-// waitForBindings(2, "queues.testaddress", 5, 5, true);
-// waitForBindings(3, "queues.testaddress", 6, 6, true);
-// waitForBindings(4, "queues.testaddress", 7, 7, true);
-//
-// waitForBindings(0, "queues.testaddress", 23, 23, false);
-// waitForBindings(1, "queues.testaddress", 23, 23, false);
-// waitForBindings(2, "queues.testaddress", 23, 23, false);
-// waitForBindings(3, "queues.testaddress", 22, 22, false);
-// waitForBindings(4, "queues.testaddress", 21, 21, false);
-//
-// send(0, "queues.testaddress", 10, false, null);
-//
-// verifyReceiveAll(10, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14);
-//
-// verifyReceiveRoundRobinInSomeOrder(10, 15, 16, 17, 18, 19);
-//
-// verifyReceiveRoundRobinInSomeOrder(10, 20, 21, 22);
-//
-// verifyReceiveRoundRobinInSomeOrder(10, 23, 24, 25);
-//
-// verifyReceiveRoundRobinInSomeOrder(10, 26, 27);
-// }
+ public void testStartStopServers() throws Exception
+ {
+ setupCluster();
+ startServers();
+
+ setupSessionFactory(0, isNetty());
+ setupSessionFactory(1, isNetty());
+ setupSessionFactory(2, isNetty());
+ setupSessionFactory(3, isNetty());
+ setupSessionFactory(4, isNetty());
+
+ createQueue(0, "queues.testaddress", "queue0", null, false);
+ createQueue(1, "queues.testaddress", "queue1", null, false);
+ createQueue(2, "queues.testaddress", "queue2", null, false);
+ createQueue(3, "queues.testaddress", "queue3", null, false);
+ createQueue(4, "queues.testaddress", "queue4", null, false);
+
+ createQueue(0, "queues.testaddress", "queue5", null, false);
+ createQueue(1, "queues.testaddress", "queue6", null, false);
+ createQueue(2, "queues.testaddress", "queue7", null, false);
+ createQueue(3, "queues.testaddress", "queue8", null, false);
+ createQueue(4, "queues.testaddress", "queue9", null, false);
+
+ createQueue(0, "queues.testaddress", "queue10", null, false);
+ createQueue(1, "queues.testaddress", "queue11", null, false);
+ createQueue(2, "queues.testaddress", "queue12", null, false);
+ createQueue(3, "queues.testaddress", "queue13", null, false);
+ createQueue(4, "queues.testaddress", "queue14", null, false);
+
+ createQueue(0, "queues.testaddress", "queue15", null, false);
+ createQueue(1, "queues.testaddress", "queue15", null, false);
+ createQueue(2, "queues.testaddress", "queue15", null, false);
+ createQueue(3, "queues.testaddress", "queue15", null, false);
+ createQueue(4, "queues.testaddress", "queue15", null, false);
+
+ createQueue(2, "queues.testaddress", "queue16", null, false);
+ createQueue(3, "queues.testaddress", "queue16", null, false);
+ createQueue(4, "queues.testaddress", "queue16", null, false);
+
+ createQueue(0, "queues.testaddress", "queue17", null, false);
+ createQueue(1, "queues.testaddress", "queue17", null, false);
+ createQueue(4, "queues.testaddress", "queue17", null, false);
+
+ createQueue(3, "queues.testaddress", "queue18", null, false);
+ createQueue(4, "queues.testaddress", "queue18", null, false);
+
+ addConsumer(0, 0, "queue0", null);
+ addConsumer(1, 1, "queue1", null);
+ addConsumer(2, 2, "queue2", null);
+ addConsumer(3, 3, "queue3", null);
+ addConsumer(4, 4, "queue4", null);
+
+ addConsumer(5, 0, "queue5", null);
+ addConsumer(6, 1, "queue6", null);
+ addConsumer(7, 2, "queue7", null);
+ addConsumer(8, 3, "queue8", null);
+ addConsumer(9, 4, "queue9", null);
+
+ addConsumer(10, 0, "queue10", null);
+ addConsumer(11, 1, "queue11", null);
+ addConsumer(12, 2, "queue12", null);
+ addConsumer(13, 3, "queue13", null);
+ addConsumer(14, 4, "queue14", null);
+
+ addConsumer(15, 0, "queue15", null);
+ addConsumer(16, 1, "queue15", null);
+ addConsumer(17, 2, "queue15", null);
+ addConsumer(18, 3, "queue15", null);
+ addConsumer(19, 4, "queue15", null);
+
+ addConsumer(20, 2, "queue16", null);
+ addConsumer(21, 3, "queue16", null);
+ addConsumer(22, 4, "queue16", null);
+
+ addConsumer(23, 0, "queue17", null);
+ addConsumer(24, 1, "queue17", null);
+ addConsumer(25, 4, "queue17", null);
+
+ addConsumer(26, 3, "queue18", null);
+ addConsumer(27, 4, "queue18", null);
+
+ waitForBindings(0, "queues.testaddress", 5, 5, true);
+ waitForBindings(1, "queues.testaddress", 5, 5, true);
+ waitForBindings(2, "queues.testaddress", 5, 5, true);
+ waitForBindings(3, "queues.testaddress", 6, 6, true);
+ waitForBindings(4, "queues.testaddress", 7, 7, true);
+
+ waitForBindings(0, "queues.testaddress", 23, 23, false);
+ waitForBindings(1, "queues.testaddress", 23, 23, false);
+ waitForBindings(2, "queues.testaddress", 23, 23, false);
+ waitForBindings(3, "queues.testaddress", 22, 22, false);
+ waitForBindings(4, "queues.testaddress", 21, 21, false);
+
+ send(0, "queues.testaddress", 10, false, null);
+
+ verifyReceiveAll(10, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14);
+
+ verifyReceiveRoundRobinInSomeOrder(10, 15, 16, 17, 18, 19);
+
+ verifyReceiveRoundRobinInSomeOrder(10, 20, 21, 22);
+
+ verifyReceiveRoundRobinInSomeOrder(10, 23, 24, 25);
+
+ verifyReceiveRoundRobinInSomeOrder(10, 26, 27);
+
+ removeConsumer(0);
+ removeConsumer(5);
+ removeConsumer(10);
+ removeConsumer(15);
+ removeConsumer(23);
+ removeConsumer(3);
+ removeConsumer(8);
+ removeConsumer(13);
+ removeConsumer(18);
+ removeConsumer(21);
+ removeConsumer(26);
+
+ closeSessionFactory(0);
+ closeSessionFactory(3);
+
+ stopServers(0, 3);
+
+ startServers(3, 0);
+
+ setupSessionFactory(0, isNetty());
+ setupSessionFactory(3, isNetty());
+
+ createQueue(0, "queues.testaddress", "queue0", null, false);
+ createQueue(3, "queues.testaddress", "queue3", null, false);
+
+ createQueue(0, "queues.testaddress", "queue5", null, false);
+ createQueue(3, "queues.testaddress", "queue8", null, false);
+
+ createQueue(0, "queues.testaddress", "queue10", null, false);
+ createQueue(3, "queues.testaddress", "queue13", null, false);
+
+ createQueue(0, "queues.testaddress", "queue15", null, false);
+ createQueue(3, "queues.testaddress", "queue15", null, false);
+
+ createQueue(3, "queues.testaddress", "queue16", null, false);
+
+ createQueue(0, "queues.testaddress", "queue17", null, false);
+
+ createQueue(3, "queues.testaddress", "queue18", null, false);
+
+ addConsumer(0, 0, "queue0", null);
+ addConsumer(3, 3, "queue3", null);
+
+ addConsumer(5, 0, "queue5", null);
+ addConsumer(8, 3, "queue8", null);
+
+ addConsumer(10, 0, "queue10", null);
+ addConsumer(13, 3, "queue13", null);
+
+ addConsumer(15, 0, "queue15", null);
+ addConsumer(18, 3, "queue15", null);
+
+ addConsumer(21, 3, "queue16", null);
+
+ addConsumer(23, 0, "queue17", null);
+
+ addConsumer(26, 3, "queue18", null);
+
+ waitForBindings(0, "queues.testaddress", 5, 5, true);
+ waitForBindings(1, "queues.testaddress", 5, 5, true);
+ waitForBindings(2, "queues.testaddress", 5, 5, true);
+ waitForBindings(3, "queues.testaddress", 6, 6, true);
+ waitForBindings(4, "queues.testaddress", 7, 7, true);
+
+ waitForBindings(0, "queues.testaddress", 23, 23, false);
+ waitForBindings(1, "queues.testaddress", 23, 23, false);
+ waitForBindings(2, "queues.testaddress", 23, 23, false);
+ waitForBindings(3, "queues.testaddress", 22, 22, false);
+ waitForBindings(4, "queues.testaddress", 21, 21, false);
+
+ send(0, "queues.testaddress", 10, false, null);
+
+ verifyReceiveAll(10, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14);
+
+ verifyReceiveRoundRobinInSomeOrder(10, 15, 16, 17, 18, 19);
+
+ verifyReceiveRoundRobinInSomeOrder(10, 20, 21, 22);
+
+ verifyReceiveRoundRobinInSomeOrder(10, 23, 24, 25);
+
+ verifyReceiveRoundRobinInSomeOrder(10, 26, 27);
+ }
+
protected void setupCluster() throws Exception
{
setupCluster(false);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/SymmetricClusterTestWithBackup.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/SymmetricClusterTestWithBackup.java 2009-03-24 10:22:17 UTC (rev 6147)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/SymmetricClusterTestWithBackup.java 2009-03-24 12:07:56 UTC (rev 6148)
@@ -35,98 +35,97 @@
*/
public class SymmetricClusterTestWithBackup extends SymmetricClusterTest
{
-//Temporarily commented out
-// @Override
-// public void testStopAllStartAll() throws Exception
-// {
-// setupCluster();
-//
-// startServers();
-//
-// setupSessionFactory(0, isNetty());
-// setupSessionFactory(1, isNetty());
-// setupSessionFactory(2, isNetty());
-// setupSessionFactory(3, isNetty());
-// setupSessionFactory(4, isNetty());
-//
-// createQueue(0, "queues.testaddress", "queue0", null, false);
-// createQueue(1, "queues.testaddress", "queue0", null, false);
-// createQueue(2, "queues.testaddress", "queue0", null, false);
-// createQueue(3, "queues.testaddress", "queue0", null, false);
-// createQueue(4, "queues.testaddress", "queue0", null, false);
-//
-// addConsumer(0, 0, "queue0", null);
-// addConsumer(1, 1, "queue0", null);
-// addConsumer(2, 2, "queue0", null);
-// addConsumer(3, 3, "queue0", null);
-// addConsumer(4, 4, "queue0", null);
-//
-// waitForBindings(0, "queues.testaddress", 1, 1, true);
-// waitForBindings(1, "queues.testaddress", 1, 1, true);
-// waitForBindings(2, "queues.testaddress", 1, 1, true);
-// waitForBindings(3, "queues.testaddress", 1, 1, true);
-// waitForBindings(4, "queues.testaddress", 1, 1, true);
-//
-// waitForBindings(0, "queues.testaddress", 4, 4, false);
-// waitForBindings(1, "queues.testaddress", 4, 4, false);
-// waitForBindings(2, "queues.testaddress", 4, 4, false);
-// waitForBindings(3, "queues.testaddress", 4, 4, false);
-// waitForBindings(4, "queues.testaddress", 4, 4, false);
-//
-// send(0, "queues.testaddress", 10, false, null);
-//
-// verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2, 3, 4);
-//
-// this.verifyNotReceive(0, 1, 2, 3, 4);
-//
-// this.removeConsumer(0);
-// this.removeConsumer(1);
-// this.removeConsumer(2);
-// this.removeConsumer(3);
-// this.removeConsumer(4);
-//
-// this.closeAllSessionFactories();
-//
-// stopServers(0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
-//
-// startServers();
-//
-// setupSessionFactory(0, isNetty());
-// setupSessionFactory(1, isNetty());
-// setupSessionFactory(2, isNetty());
-// setupSessionFactory(3, isNetty());
-// setupSessionFactory(4, isNetty());
-//
-// createQueue(0, "queues.testaddress", "queue0", null, false);
-// createQueue(1, "queues.testaddress", "queue0", null, false);
-// createQueue(2, "queues.testaddress", "queue0", null, false);
-// createQueue(3, "queues.testaddress", "queue0", null, false);
-// createQueue(4, "queues.testaddress", "queue0", null, false);
-//
-// addConsumer(0, 0, "queue0", null);
-// addConsumer(1, 1, "queue0", null);
-// addConsumer(2, 2, "queue0", null);
-// addConsumer(3, 3, "queue0", null);
-// addConsumer(4, 4, "queue0", null);
-//
-// waitForBindings(0, "queues.testaddress", 1, 1, true);
-// waitForBindings(1, "queues.testaddress", 1, 1, true);
-// waitForBindings(2, "queues.testaddress", 1, 1, true);
-// waitForBindings(3, "queues.testaddress", 1, 1, true);
-// waitForBindings(4, "queues.testaddress", 1, 1, true);
-//
-// waitForBindings(0, "queues.testaddress", 4, 4, false);
-// waitForBindings(1, "queues.testaddress", 4, 4, false);
-// waitForBindings(2, "queues.testaddress", 4, 4, false);
-// waitForBindings(3, "queues.testaddress", 4, 4, false);
-// waitForBindings(4, "queues.testaddress", 4, 4, false);
-//
-// send(0, "queues.testaddress", 10, false, null);
-//
-// verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2, 3, 4);
-//
-// this.verifyNotReceive(0, 1, 2, 3, 4);
-// }
+ @Override
+ public void testStopAllStartAll() throws Exception
+ {
+ setupCluster();
+
+ startServers();
+
+ setupSessionFactory(0, isNetty());
+ setupSessionFactory(1, isNetty());
+ setupSessionFactory(2, isNetty());
+ setupSessionFactory(3, isNetty());
+ setupSessionFactory(4, isNetty());
+
+ createQueue(0, "queues.testaddress", "queue0", null, false);
+ createQueue(1, "queues.testaddress", "queue0", null, false);
+ createQueue(2, "queues.testaddress", "queue0", null, false);
+ createQueue(3, "queues.testaddress", "queue0", null, false);
+ createQueue(4, "queues.testaddress", "queue0", null, false);
+
+ addConsumer(0, 0, "queue0", null);
+ addConsumer(1, 1, "queue0", null);
+ addConsumer(2, 2, "queue0", null);
+ addConsumer(3, 3, "queue0", null);
+ addConsumer(4, 4, "queue0", null);
+
+ waitForBindings(0, "queues.testaddress", 1, 1, true);
+ waitForBindings(1, "queues.testaddress", 1, 1, true);
+ waitForBindings(2, "queues.testaddress", 1, 1, true);
+ waitForBindings(3, "queues.testaddress", 1, 1, true);
+ waitForBindings(4, "queues.testaddress", 1, 1, true);
+
+ waitForBindings(0, "queues.testaddress", 4, 4, false);
+ waitForBindings(1, "queues.testaddress", 4, 4, false);
+ waitForBindings(2, "queues.testaddress", 4, 4, false);
+ waitForBindings(3, "queues.testaddress", 4, 4, false);
+ waitForBindings(4, "queues.testaddress", 4, 4, false);
+
+ send(0, "queues.testaddress", 10, false, null);
+
+ verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2, 3, 4);
+
+ this.verifyNotReceive(0, 1, 2, 3, 4);
+
+ this.removeConsumer(0);
+ this.removeConsumer(1);
+ this.removeConsumer(2);
+ this.removeConsumer(3);
+ this.removeConsumer(4);
+
+ this.closeAllSessionFactories();
+
+ stopServers(0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
+
+ startServers();
+
+ setupSessionFactory(0, isNetty());
+ setupSessionFactory(1, isNetty());
+ setupSessionFactory(2, isNetty());
+ setupSessionFactory(3, isNetty());
+ setupSessionFactory(4, isNetty());
+
+ createQueue(0, "queues.testaddress", "queue0", null, false);
+ createQueue(1, "queues.testaddress", "queue0", null, false);
+ createQueue(2, "queues.testaddress", "queue0", null, false);
+ createQueue(3, "queues.testaddress", "queue0", null, false);
+ createQueue(4, "queues.testaddress", "queue0", null, false);
+
+ addConsumer(0, 0, "queue0", null);
+ addConsumer(1, 1, "queue0", null);
+ addConsumer(2, 2, "queue0", null);
+ addConsumer(3, 3, "queue0", null);
+ addConsumer(4, 4, "queue0", null);
+
+ waitForBindings(0, "queues.testaddress", 1, 1, true);
+ waitForBindings(1, "queues.testaddress", 1, 1, true);
+ waitForBindings(2, "queues.testaddress", 1, 1, true);
+ waitForBindings(3, "queues.testaddress", 1, 1, true);
+ waitForBindings(4, "queues.testaddress", 1, 1, true);
+
+ waitForBindings(0, "queues.testaddress", 4, 4, false);
+ waitForBindings(1, "queues.testaddress", 4, 4, false);
+ waitForBindings(2, "queues.testaddress", 4, 4, false);
+ waitForBindings(3, "queues.testaddress", 4, 4, false);
+ waitForBindings(4, "queues.testaddress", 4, 4, false);
+
+ send(0, "queues.testaddress", 10, false, null);
+
+ verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2, 3, 4);
+
+ this.verifyNotReceive(0, 1, 2, 3, 4);
+ }
@Override
public void testMixtureLoadBalancedAndNonLoadBalancedQueuesAddQueuesAndConsumersBeforeAllServersAreStarted() throws Exception
More information about the jboss-cvs-commits
mailing list