[jboss-cvs] JBoss Messaging SVN: r6587 - in trunk: src/main/org/jboss/messaging/core/server/cluster and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 27 17:35:26 EDT 2009
Author: timfox
Date: 2009-04-27 17:35:26 -0400 (Mon, 27 Apr 2009)
New Revision: 6587
Modified:
trunk/src/main/org/jboss/messaging/core/postoffice/impl/LocalQueueBinding.java
trunk/src/main/org/jboss/messaging/core/server/cluster/ClusterManager.java
trunk/src/main/org/jboss/messaging/core/server/cluster/impl/ClusterConnectionImpl.java
trunk/src/main/org/jboss/messaging/core/server/cluster/impl/ClusterManagerImpl.java
trunk/src/main/org/jboss/messaging/core/server/cluster/impl/RemoteQueueBindingImpl.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ClusterWithBackupFailoverTest.java
Log:
fixed failover tests
Modified: trunk/src/main/org/jboss/messaging/core/postoffice/impl/LocalQueueBinding.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/postoffice/impl/LocalQueueBinding.java 2009-04-27 21:29:21 UTC (rev 6586)
+++ trunk/src/main/org/jboss/messaging/core/postoffice/impl/LocalQueueBinding.java 2009-04-27 21:35:26 UTC (rev 6587)
@@ -161,7 +161,7 @@
}
public void willRoute(final ServerMessage message)
- {
+ {
}
public boolean isQueueBinding()
Modified: trunk/src/main/org/jboss/messaging/core/server/cluster/ClusterManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/cluster/ClusterManager.java 2009-04-27 21:29:21 UTC (rev 6586)
+++ trunk/src/main/org/jboss/messaging/core/server/cluster/ClusterManager.java 2009-04-27 21:35:26 UTC (rev 6587)
@@ -44,5 +44,7 @@
ClusterConnection getClusterConnection(SimpleString name);
+ Set<BroadcastGroup> getBroadcastGroups();
+
void activate();
}
Modified: trunk/src/main/org/jboss/messaging/core/server/cluster/impl/ClusterConnectionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/cluster/impl/ClusterConnectionImpl.java 2009-04-27 21:29:21 UTC (rev 6586)
+++ trunk/src/main/org/jboss/messaging/core/server/cluster/impl/ClusterConnectionImpl.java 2009-04-27 21:35:26 UTC (rev 6587)
@@ -638,6 +638,7 @@
private synchronized void clearBindings() throws Exception
{
+ log.info("clearing bindings for " + name);
for (RemoteQueueBinding binding : new HashSet<RemoteQueueBinding>(bindings.values()))
{
removeBinding(binding.getClusterName(), replicatingChannel);
Modified: trunk/src/main/org/jboss/messaging/core/server/cluster/impl/ClusterManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/cluster/impl/ClusterManagerImpl.java 2009-04-27 21:29:21 UTC (rev 6586)
+++ trunk/src/main/org/jboss/messaging/core/server/cluster/impl/ClusterManagerImpl.java 2009-04-27 21:35:26 UTC (rev 6587)
@@ -222,6 +222,11 @@
return new HashSet<ClusterConnection>(clusters.values());
}
+ public Set<BroadcastGroup> getBroadcastGroups()
+ {
+ return new HashSet<BroadcastGroup>(broadcastGroups.values());
+ }
+
public ClusterConnection getClusterConnection(final SimpleString name)
{
return clusters.get(name.toString());
Modified: trunk/src/main/org/jboss/messaging/core/server/cluster/impl/RemoteQueueBindingImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/cluster/impl/RemoteQueueBindingImpl.java 2009-04-27 21:29:21 UTC (rev 6586)
+++ trunk/src/main/org/jboss/messaging/core/server/cluster/impl/RemoteQueueBindingImpl.java 2009-04-27 21:35:26 UTC (rev 6587)
@@ -195,7 +195,7 @@
}
public void willRoute(final ServerMessage message)
- {
+ {
//We add a header with the name of the queue, holding a list of the transient ids of the queues to route to
//TODO - this can be optimised
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-04-27 21:29:21 UTC (rev 6586)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java 2009-04-27 21:35:26 UTC (rev 6587)
@@ -603,11 +603,11 @@
message.acknowledge();
}
- // log.info("consumer " + consumerIDs[i] +" returns " + count);
+ //log.info("consumer " + consumerIDs[i] +" returns " + count);
}
else
{
- // log.info("consumer " + consumerIDs[i] +" returns null");
+ // log.info("consumer " + consumerIDs[i] +" returns null");
}
}
while (message != null);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ClusterWithBackupFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ClusterWithBackupFailoverTest.java 2009-04-27 21:29:21 UTC (rev 6586)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ClusterWithBackupFailoverTest.java 2009-04-27 21:35:26 UTC (rev 6587)
@@ -28,6 +28,7 @@
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.server.MessagingServer;
+import org.jboss.messaging.core.server.cluster.BroadcastGroup;
import org.jboss.messaging.tests.integration.cluster.distribution.ClusterTestBase;
/**
@@ -108,6 +109,8 @@
verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
failNode(0);
+
+ log.info("** now sending");
send(0, "queues.testaddress", 10, false, null);
verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
@@ -123,23 +126,11 @@
send(0, "queues.testaddress", 10, false, null);
verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
-// send(1, "queues.testaddress", 10, false, null);
-// verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
-//
-// send(2, "queues.testaddress", 10, false, null);
-// verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
-
failNode(2);
send(0, "queues.testaddress", 10, false, null);
verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
-// send(1, "queues.testaddress", 10, false, null);
-// verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
-//
-// send(2, "queues.testaddress", 10, false, null);
-// verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
-
stopServers();
}
@@ -249,7 +240,11 @@
//Prevent remoting service taking any more connections
server.getRemotingService().freeze();
- server.getClusterManager().stop();
+ //Stop it broadcasting
+ for (BroadcastGroup group: server.getClusterManager().getBroadcastGroups())
+ {
+ group.stop();
+ }
//Fail all client connections that go to this node
super.failNode(serverTC);
More information about the jboss-cvs-commits
mailing list