[jboss-cvs] JBoss Messaging SVN: r2696 - in trunk: tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 16 04:59:06 EDT 2007
Author: sergeypk
Date: 2007-05-16 04:59:06 -0400 (Wed, 16 May 2007)
New Revision: 2696
Added:
trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/ClusteredPostOfficeConfigurationTest.java
Modified:
trunk/src/etc/server/default/deploy/clustered-db2-persistence-service.xml
trunk/src/etc/server/default/deploy/clustered-mssql-persistence-service.xml
trunk/src/etc/server/default/deploy/clustered-mysql-persistence-service.xml
trunk/src/etc/server/default/deploy/clustered-oracle-persistence-service.xml
trunk/src/etc/server/default/deploy/clustered-postgresql-persistence-service.xml
trunk/src/etc/server/default/deploy/clustered-sybase-persistence-service.xml
Log:
JBMESSAGING-960 - removed bind_addr from clustered-*-persistence-service.xml files. Added (preliminary) ClusteredPostOfficeConfigurationTest.java to verify that JGroups configuration works as intended.
Modified: trunk/src/etc/server/default/deploy/clustered-db2-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/clustered-db2-persistence-service.xml 2007-05-16 08:42:17 UTC (rev 2695)
+++ trunk/src/etc/server/default/deploy/clustered-db2-persistence-service.xml 2007-05-16 08:59:06 UTC (rev 2696)
@@ -97,7 +97,7 @@
<config>
<UDP mcast_recv_buf_size="500000" down_thread="false" ip_mcast="true" mcast_send_buf_size="32000"
mcast_port="45567" ucast_recv_buf_size="500000" use_incoming_packet_handler="false"
- mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" bind_addr="127.0.0.1"/>
+ mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" />
<AUTOCONF down_thread="false" up_thread="false"/>
<PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/>
<MERGE2 max_interval="10000" down_thread="false" min_interval="5000" up_thread="false"/>
@@ -118,7 +118,7 @@
<config>
<UDP mcast_recv_buf_size="500000" down_thread="false" ip_mcast="true" mcast_send_buf_size="32000"
mcast_port="45568" ucast_recv_buf_size="500000" use_incoming_packet_handler="false"
- mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" bind_addr="127.0.0.1"/>
+ mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" />
<AUTOCONF down_thread="false" up_thread="false"/>
<PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/>
<MERGE2 max_interval="10000" down_thread="false" min_interval="5000" up_thread="false"/>
Modified: trunk/src/etc/server/default/deploy/clustered-mssql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/clustered-mssql-persistence-service.xml 2007-05-16 08:42:17 UTC (rev 2695)
+++ trunk/src/etc/server/default/deploy/clustered-mssql-persistence-service.xml 2007-05-16 08:59:06 UTC (rev 2696)
@@ -97,7 +97,7 @@
<config>
<UDP mcast_recv_buf_size="500000" down_thread="false" ip_mcast="true" mcast_send_buf_size="32000"
mcast_port="45567" ucast_recv_buf_size="500000" use_incoming_packet_handler="false"
- mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" bind_addr="127.0.0.1"/>
+ mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" />
<AUTOCONF down_thread="false" up_thread="false"/>
<PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/>
<MERGE2 max_interval="10000" down_thread="false" min_interval="5000" up_thread="false"/>
@@ -118,7 +118,7 @@
<config>
<UDP mcast_recv_buf_size="500000" down_thread="false" ip_mcast="true" mcast_send_buf_size="32000"
mcast_port="45568" ucast_recv_buf_size="500000" use_incoming_packet_handler="false"
- mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" bind_addr="127.0.0.1"/>
+ mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" />
<AUTOCONF down_thread="false" up_thread="false"/>
<PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/>
<MERGE2 max_interval="10000" down_thread="false" min_interval="5000" up_thread="false"/>
Modified: trunk/src/etc/server/default/deploy/clustered-mysql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/clustered-mysql-persistence-service.xml 2007-05-16 08:42:17 UTC (rev 2695)
+++ trunk/src/etc/server/default/deploy/clustered-mysql-persistence-service.xml 2007-05-16 08:59:06 UTC (rev 2696)
@@ -97,7 +97,7 @@
<config>
<UDP mcast_recv_buf_size="500000" down_thread="false" ip_mcast="true" mcast_send_buf_size="32000"
mcast_port="45567" ucast_recv_buf_size="500000" use_incoming_packet_handler="false"
- mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" bind_addr="127.0.0.1"/>
+ mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32"/>
<AUTOCONF down_thread="false" up_thread="false"/>
<PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/>
<MERGE2 max_interval="10000" down_thread="false" min_interval="5000" up_thread="false"/>
@@ -118,7 +118,7 @@
<config>
<UDP mcast_recv_buf_size="500000" down_thread="false" ip_mcast="true" mcast_send_buf_size="32000"
mcast_port="45568" ucast_recv_buf_size="500000" use_incoming_packet_handler="false"
- mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" bind_addr="127.0.0.1"/>
+ mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32"/>
<AUTOCONF down_thread="false" up_thread="false"/>
<PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/>
<MERGE2 max_interval="10000" down_thread="false" min_interval="5000" up_thread="false"/>
Modified: trunk/src/etc/server/default/deploy/clustered-oracle-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/clustered-oracle-persistence-service.xml 2007-05-16 08:42:17 UTC (rev 2695)
+++ trunk/src/etc/server/default/deploy/clustered-oracle-persistence-service.xml 2007-05-16 08:59:06 UTC (rev 2696)
@@ -97,7 +97,7 @@
<config>
<UDP mcast_recv_buf_size="500000" down_thread="false" ip_mcast="true" mcast_send_buf_size="32000"
mcast_port="45567" ucast_recv_buf_size="500000" use_incoming_packet_handler="false"
- mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" bind_addr="127.0.0.1"/>
+ mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" />
<AUTOCONF down_thread="false" up_thread="false"/>
<PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/>
<MERGE2 max_interval="10000" down_thread="false" min_interval="5000" up_thread="false"/>
@@ -118,7 +118,7 @@
<config>
<UDP mcast_recv_buf_size="500000" down_thread="false" ip_mcast="true" mcast_send_buf_size="32000"
mcast_port="45568" ucast_recv_buf_size="500000" use_incoming_packet_handler="false"
- mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" bind_addr="127.0.0.1"/>
+ mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" />
<AUTOCONF down_thread="false" up_thread="false"/>
<PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/>
<MERGE2 max_interval="10000" down_thread="false" min_interval="5000" up_thread="false"/>
Modified: trunk/src/etc/server/default/deploy/clustered-postgresql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/clustered-postgresql-persistence-service.xml 2007-05-16 08:42:17 UTC (rev 2695)
+++ trunk/src/etc/server/default/deploy/clustered-postgresql-persistence-service.xml 2007-05-16 08:59:06 UTC (rev 2696)
@@ -97,7 +97,7 @@
<config>
<UDP mcast_recv_buf_size="500000" down_thread="false" ip_mcast="true" mcast_send_buf_size="32000"
mcast_port="45567" ucast_recv_buf_size="500000" use_incoming_packet_handler="false"
- mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" bind_addr="127.0.0.1"/>
+ mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" />
<AUTOCONF down_thread="false" up_thread="false"/>
<PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/>
<MERGE2 max_interval="10000" down_thread="false" min_interval="5000" up_thread="false"/>
@@ -118,7 +118,7 @@
<config>
<UDP mcast_recv_buf_size="500000" down_thread="false" ip_mcast="true" mcast_send_buf_size="32000"
mcast_port="45568" ucast_recv_buf_size="500000" use_incoming_packet_handler="false"
- mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" bind_addr="127.0.0.1"/>
+ mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" />
<AUTOCONF down_thread="false" up_thread="false"/>
<PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/>
<MERGE2 max_interval="10000" down_thread="false" min_interval="5000" up_thread="false"/>
Modified: trunk/src/etc/server/default/deploy/clustered-sybase-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/clustered-sybase-persistence-service.xml 2007-05-16 08:42:17 UTC (rev 2695)
+++ trunk/src/etc/server/default/deploy/clustered-sybase-persistence-service.xml 2007-05-16 08:59:06 UTC (rev 2696)
@@ -98,7 +98,7 @@
<config>
<UDP mcast_recv_buf_size="500000" down_thread="false" ip_mcast="true" mcast_send_buf_size="32000"
mcast_port="45567" ucast_recv_buf_size="500000" use_incoming_packet_handler="false"
- mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" bind_addr="127.0.0.1"/>
+ mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" />
<AUTOCONF down_thread="false" up_thread="false"/>
<PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/>
<MERGE2 max_interval="10000" down_thread="false" min_interval="5000" up_thread="false"/>
@@ -119,7 +119,7 @@
<config>
<UDP mcast_recv_buf_size="500000" down_thread="false" ip_mcast="true" mcast_send_buf_size="32000"
mcast_port="45568" ucast_recv_buf_size="500000" use_incoming_packet_handler="false"
- mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" bind_addr="127.0.0.1"/>
+ mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" />
<AUTOCONF down_thread="false" up_thread="false"/>
<PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/>
<MERGE2 max_interval="10000" down_thread="false" min_interval="5000" up_thread="false"/>
Added: trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/ClusteredPostOfficeConfigurationTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/ClusteredPostOfficeConfigurationTest.java (rev 0)
+++ trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/ClusteredPostOfficeConfigurationTest.java 2007-05-16 08:59:06 UTC (rev 2696)
@@ -0,0 +1,104 @@
+package org.jboss.test.messaging.core.plugin.postoffice.cluster;
+
+import java.lang.reflect.Field;
+import java.net.InetAddress;
+import java.util.Properties;
+import java.util.Vector;
+
+import org.jboss.messaging.core.plugin.contract.ClusteredPostOffice;
+import org.jboss.messaging.core.plugin.postoffice.cluster.DefaultClusteredPostOffice;
+import org.jboss.test.messaging.core.plugin.base.PostOfficeTestBase;
+import org.jgroups.JChannel;
+import org.jgroups.protocols.TP;
+import org.jgroups.protocols.UDP;
+import org.jgroups.stack.Protocol;
+import org.jgroups.stack.ProtocolStack;
+
+// This test assumes that bind_addr is not set in the clustered-*-persistence.xml
+// configuration file!
+// TODO this test actually tests JGroups rather than Messaging
+public class ClusteredPostOfficeConfigurationTest extends PostOfficeTestBase
+{
+ public ClusteredPostOfficeConfigurationTest(String name)
+ {
+ super(name);
+ }
+
+ private Properties savedProperties;
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ savedProperties = (Properties) System.getProperties().clone();
+
+ Properties systemProperties = System.getProperties();
+
+ // Remove JGroups properties if there are any
+ systemProperties.remove(org.jgroups.Global.BIND_ADDR_OLD);
+ systemProperties.remove(org.jgroups.Global.IGNORE_BIND_ADDRESS_PROPERTY_OLD);
+
+ systemProperties.remove(org.jgroups.Global.BIND_ADDR);
+ systemProperties.remove(org.jgroups.Global.IGNORE_BIND_ADDRESS_PROPERTY);
+ }
+
+ protected void tearDown() throws Exception
+ {
+ System.setProperties(savedProperties);
+ super.tearDown();
+ }
+
+ protected ClusteredPostOffice createClusteredPostOfficeSimple() throws Exception {
+ return createClusteredPostOffice(1, "testgroup", sc, ms, pm, tr);
+ }
+
+ // TODO these two methods are of course very ugly
+ private static JChannel getPostOfficeSyncChannel(ClusteredPostOffice postOffice) throws Exception {
+ Field field = DefaultClusteredPostOffice.class.getDeclaredField("syncChannel");
+ field.setAccessible(true);
+ return (JChannel) field.get(postOffice);
+ }
+
+ private static JChannel getPostOfficeAsyncChannel(ClusteredPostOffice postOffice) throws Exception {
+ Field field = DefaultClusteredPostOffice.class.getDeclaredField("asyncChannel");
+ field.setAccessible(true);
+ return (JChannel) field.get(postOffice);
+ }
+
+ private static String getUDPBindAddress(JChannel channel) {
+ Vector protocols = channel.getProtocolStack().getProtocols();
+ for (int i = 0; i < protocols.size(); i++) {
+ Protocol protocol = (Protocol) protocols.get(i);
+ if (protocol instanceof UDP) {
+ return ((UDP) protocol).getBindAddress();
+ }
+ }
+
+ return null;
+ }
+
+ private void assertChannelsBoundTo(InetAddress bindAddress) throws Exception {
+ String addressAsString = bindAddress.toString();
+ ClusteredPostOffice postOffice = createClusteredPostOfficeSimple();
+
+ JChannel syncChannel = getPostOfficeSyncChannel(postOffice);
+ assertEquals(addressAsString, getUDPBindAddress(syncChannel));
+
+ JChannel asyncChannel = getPostOfficeAsyncChannel(postOffice);
+ assertEquals(addressAsString, getUDPBindAddress(asyncChannel));
+ }
+
+ public void testNoProperties() throws Exception {
+ InetAddress address = org.jgroups.util.Util.getFirstNonLoopbackAddress();
+ if (address == null) {
+ fail("No address available for JGroups to bind to");
+ }
+ assertChannelsBoundTo(address);
+ }
+
+ public void testBindAddressPropertySet() throws Exception {
+ String address = "127.0.0.1";
+ System.setProperty(org.jgroups.Global.BIND_ADDR, address);
+ assertChannelsBoundTo(InetAddress.getByName(address));
+ }
+}
More information about the jboss-cvs-commits
mailing list