[hornetq-commits] JBoss hornetq SVN: r11126 - in branches/Branch_2_2_EAP_cluster_clean2: src/main/org/hornetq/core/server/cluster/impl and 4 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Aug 4 20:39:07 EDT 2011
Author: clebert.suconic at jboss.com
Date: 2011-08-04 20:39:07 -0400 (Thu, 04 Aug 2011)
New Revision: 11126
Modified:
branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/HornetQServer.java
branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java
branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java
branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java
branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/util/ServiceTestBase.java
Log:
test fixes
Modified: branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/HornetQServer.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/HornetQServer.java 2011-08-04 23:34:24 UTC (rev 11125)
+++ branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/HornetQServer.java 2011-08-05 00:39:07 UTC (rev 11126)
@@ -57,6 +57,9 @@
public interface HornetQServer extends HornetQComponent
{
+ /** This method was created mainly for testing but it may be used in scenarios where
+ * you need to have more than one Server inside the same VM.
+ * This identity will be exposed on logs what may help you to debug issues on the log traces and debugs.*/
void setIdentity(String identity);
String getIdentity();
Modified: branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2011-08-04 23:34:24 UTC (rev 11125)
+++ branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2011-08-05 00:39:07 UTC (rev 11126)
@@ -958,6 +958,17 @@
// for testing
public void clear()
{
+ for (Bridge bridge : bridges.values())
+ {
+ try
+ {
+ bridge.stop();
+ }
+ catch (Exception e)
+ {
+ log.warn(e.getMessage(), e);
+ }
+ }
bridges.clear();
for (ClusterConnection clusterConnection : clusterConnections.values())
{
Modified: branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-08-04 23:34:24 UTC (rev 11125)
+++ branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-08-05 00:39:07 UTC (rev 11126)
@@ -849,6 +849,7 @@
return str.toString();
}
+
public void setIdentity(String identity)
{
this.identity = identity;
Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2011-08-04 23:34:24 UTC (rev 11125)
+++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2011-08-05 00:39:07 UTC (rev 11126)
@@ -1476,22 +1476,24 @@
{
if (sharedStorage)
{
- server = createInVMFailoverServer(true, configuration, nodeManagers[node]);
+ server = createInVMFailoverServer(true, configuration, nodeManagers[node], node);
}
else
{
server = HornetQServers.newHornetQServer(configuration);
+ server.setIdentity("Server " + node);
}
}
else
{
if (sharedStorage)
{
- server = createInVMFailoverServer(false, configuration, nodeManagers[node]);
+ server = createInVMFailoverServer(false, configuration, nodeManagers[node], node);
}
else
{
server = HornetQServers.newHornetQServer(configuration, false);
+ server.setIdentity("Server " + node);
}
}
@@ -1553,22 +1555,24 @@
{
if (sharedStorage)
{
- server = createInVMFailoverServer(true, configuration, nodeManagers[liveNode]);
+ server = createInVMFailoverServer(true, configuration, nodeManagers[liveNode], liveNode);
}
else
{
server = HornetQServers.newHornetQServer(configuration);
+ server.setIdentity("Server " + liveNode);
}
}
else
{
if (sharedStorage)
{
- server = createInVMFailoverServer(true, configuration, nodeManagers[liveNode]);
+ server = createInVMFailoverServer(true, configuration, nodeManagers[liveNode], liveNode);
}
else
{
server = HornetQServers.newHornetQServer(configuration, false);
+ server.setIdentity("Server " + liveNode);
}
}
server.setIdentity(this.getClass().getSimpleName() + "/Backup(" + node + " of live " + liveNode + ")");
@@ -1632,22 +1636,24 @@
{
if (sharedStorage)
{
- server = createInVMFailoverServer(true, configuration, nodeManagers[node]);
+ server = createInVMFailoverServer(true, configuration, nodeManagers[node], node);
}
else
{
server = HornetQServers.newHornetQServer(configuration);
+ server.setIdentity("Server " + node);
}
}
else
{
if (sharedStorage)
{
- server = createInVMFailoverServer(false, configuration, nodeManagers[node]);
+ server = createInVMFailoverServer(false, configuration, nodeManagers[node], node);
}
else
{
server = HornetQServers.newHornetQServer(configuration, false);
+ server.setIdentity("Server " + node);
}
}
servers[node] = server;
@@ -1719,18 +1725,19 @@
{
if (sharedStorage)
{
- server = createInVMFailoverServer(true, configuration, nodeManagers[liveNode]);
+ server = createInVMFailoverServer(true, configuration, nodeManagers[liveNode], liveNode);
}
else
{
server = HornetQServers.newHornetQServer(configuration);
+ server.setIdentity("Server " + liveNode);
}
}
else
{
if (sharedStorage)
{
- server = createInVMFailoverServer(false, configuration, nodeManagers[liveNode]);
+ server = createInVMFailoverServer(false, configuration, nodeManagers[liveNode], liveNode);
}
else
{
Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2011-08-04 23:34:24 UTC (rev 11125)
+++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2011-08-05 00:39:07 UTC (rev 11126)
@@ -113,12 +113,12 @@
protected TestableServer createLiveServer()
{
- return new SameProcessHornetQServer(createInVMFailoverServer(true, liveConfig, nodeManager));
+ return new SameProcessHornetQServer(createInVMFailoverServer(true, liveConfig, nodeManager, 1));
}
protected TestableServer createBackupServer()
{
- return new SameProcessHornetQServer(createInVMFailoverServer(true, backupConfig, nodeManager));
+ return new SameProcessHornetQServer(createInVMFailoverServer(true, backupConfig, nodeManager, 2));
}
/**
Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java 2011-08-04 23:34:24 UTC (rev 11125)
+++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java 2011-08-05 00:39:07 UTC (rev 11126)
@@ -25,6 +25,7 @@
import org.hornetq.core.client.impl.ServerLocatorInternal;
import org.hornetq.core.config.ClusterConnectionConfiguration;
import org.hornetq.core.config.Configuration;
+import org.hornetq.core.logging.Logger;
import org.hornetq.core.server.NodeManager;
import org.hornetq.core.server.impl.InVMNodeManager;
import org.hornetq.tests.integration.cluster.util.SameProcessHornetQServer;
@@ -55,7 +56,7 @@
}
super.tearDown();
}
-
+
public void testMultipleFailovers2LiveServers() throws Exception
{
NodeManager nodeManager1 = new InVMNodeManager();
@@ -157,7 +158,7 @@
config1.setPagingDirectory(config1.getPagingDirectory() + "_" + liveNode);
config1.setLargeMessagesDirectory(config1.getLargeMessagesDirectory() + "_" + liveNode);
- servers.put(nodeid, new SameProcessHornetQServer(createInVMFailoverServer(true, config1, nodeManager)));
+ servers.put(nodeid, new SameProcessHornetQServer(createInVMFailoverServer(true, config1, nodeManager, liveNode)));
}
protected void createLiveConfig(NodeManager nodeManager, int liveNode, int ... otherLiveNodes)
@@ -187,7 +188,7 @@
config0.setPagingDirectory(config0.getPagingDirectory() + "_" + liveNode);
config0.setLargeMessagesDirectory(config0.getLargeMessagesDirectory() + "_" + liveNode);
- servers.put(liveNode, new SameProcessHornetQServer(createInVMFailoverServer(true, config0, nodeManager)));
+ servers.put(liveNode, new SameProcessHornetQServer(createInVMFailoverServer(true, config0, nodeManager, liveNode)));
}
protected boolean isNetty()
Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2011-08-04 23:34:24 UTC (rev 11125)
+++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2011-08-05 00:39:07 UTC (rev 11126)
@@ -243,7 +243,8 @@
PagingFailoverTest.PAGE_SIZE,
PagingFailoverTest.PAGE_MAX,
new HashMap<String, AddressSettings>(),
- nodeManager);
+ nodeManager,
+ 2);
}
@Override
Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java 2011-08-04 23:34:24 UTC (rev 11125)
+++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java 2011-08-05 00:39:07 UTC (rev 11126)
@@ -125,7 +125,7 @@
config1.setPagingDirectory(config1.getPagingDirectory() + "_" + liveNode);
config1.setLargeMessagesDirectory(config1.getLargeMessagesDirectory() + "_" + liveNode);
- servers.put(nodeid, new SameProcessHornetQServer(createInVMFailoverServer(true, config1, nodeManager)));
+ servers.put(nodeid, new SameProcessHornetQServer(createInVMFailoverServer(true, config1, nodeManager, nodeid)));
}
protected void createLiveConfig(int liveNode, int ... otherLiveNodes)
@@ -155,7 +155,7 @@
config0.setPagingDirectory(config0.getPagingDirectory() + "_" + liveNode);
config0.setLargeMessagesDirectory(config0.getLargeMessagesDirectory() + "_" + liveNode);
- servers.put(liveNode, new SameProcessHornetQServer(createInVMFailoverServer(true, config0, nodeManager)));
+ servers.put(liveNode, new SameProcessHornetQServer(createInVMFailoverServer(true, config0, nodeManager, liveNode)));
}
protected boolean isNetty()
Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/util/ServiceTestBase.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2011-08-04 23:34:24 UTC (rev 11125)
+++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2011-08-05 00:39:07 UTC (rev 11126)
@@ -284,14 +284,16 @@
protected HornetQServer createInVMFailoverServer(final boolean realFiles,
final Configuration configuration,
- NodeManager nodeManager)
+ final NodeManager nodeManager,
+ final int id)
{
return createInVMFailoverServer(realFiles,
configuration,
-1,
-1,
new HashMap<String, AddressSettings>(),
- nodeManager);
+ nodeManager,
+ id);
}
protected HornetQServer createInVMFailoverServer(final boolean realFiles,
@@ -299,7 +301,8 @@
final int pageSize,
final int maxAddressSize,
final Map<String, AddressSettings> settings,
- NodeManager nodeManager)
+ NodeManager nodeManager,
+ final int id)
{
HornetQServer server;
HornetQSecurityManager securityManager = new HornetQSecurityManagerImpl();
@@ -308,6 +311,8 @@
ManagementFactory.getPlatformMBeanServer(),
securityManager,
nodeManager);
+
+ server.setIdentity("Server " + id);
for (Map.Entry<String, AddressSettings> setting : settings.entrySet())
{
More information about the hornetq-commits
mailing list