[jboss-cvs] JBoss Messaging SVN: r3264 - in trunk: src/main/org/jboss/messaging/util and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 31 07:42:28 EDT 2007
Author: timfox
Date: 2007-10-31 07:42:28 -0400 (Wed, 31 Oct 2007)
New Revision: 3264
Modified:
trunk/src/etc/server/default/deploy/db2-persistence-service.xml
trunk/src/etc/server/default/deploy/mssql-persistence-service.xml
trunk/src/etc/server/default/deploy/mysql-persistence-service.xml
trunk/src/etc/server/default/deploy/mysqlcluster-persistence-service.xml
trunk/src/etc/server/default/deploy/oracle-persistence-service.xml
trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml
trunk/src/etc/server/default/deploy/sybase-persistence-service.xml
trunk/src/main/org/jboss/messaging/util/XMLUtil.java
trunk/tests/src/org/jboss/test/messaging/jms/stress/OpenCloseStressTest.java
trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
Log:
Allow udp addresses to be configured by systemproperty
Modified: trunk/src/etc/server/default/deploy/db2-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/db2-persistence-service.xml 2007-10-31 01:23:04 UTC (rev 3263)
+++ trunk/src/etc/server/default/deploy/db2-persistence-service.xml 2007-10-31 11:42:28 UTC (rev 3264)
@@ -150,60 +150,56 @@
<!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
- <attribute name="DataChannelConfig">
+ <!-- By default we use the TCP stack for data -->
+ <attribute name="DataChannelConfig">
<config>
- <UDP
- mcast_addr="228.8.8.8"
- mcast_port="${jboss.messaging.datachanneludpport:45567}"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
- loopback="false"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- use_outgoing_packet_handler="false"
- ip_ttl="2"
- down_thread="false" up_thread="false"
- enable_bundling="false"/>
- <PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/>
- <MERGE2 max_interval="100000" down_thread="false" min_interval="20000" up_thread="false"/>
- <FD_SOCK down_thread="false" up_thread="false"/>
- <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+ <TCP start_port="7900"
+ loopback="true"
+ recv_buf_size="20000000"
+ send_buf_size="640000"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ use_outgoing_packet_handler="false"
+ down_thread="false" up_thread="false"
+ enable_bundling="false"
+ use_send_queues="false"
+ sock_conn_timeout="300"
+ skip_suspected_members="true"/>
+ <MPING timeout="4000"
+ bind_to_all_interfaces="true"
+ mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
+ mcast_port="${jboss.messaging.datachanneludpport:45567}"
+ ip_ttl="8"
+ num_initial_members="2"
+ num_ping_requests="1"/>
+ <MERGE2 max_interval="100000"
+ down_thread="false" up_thread="false" min_interval="20000"/>
+ <FD_SOCK down_thread="false" up_thread="false"/>
<VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
- <pbcast.NAKACK
- max_xmit_size="60000"
- use_mcast_xmit="false"
- gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- down_thread="false" up_thread="false"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"
- down_thread="false" up_thread="false"/>
+ <pbcast.NAKACK max_xmit_size="60000"
+ use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ down_thread="false" up_thread="false"
+ discard_delivered_msgs="true"/>
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
down_thread="false" up_thread="false"
max_bytes="400000"/>
<pbcast.GMS print_local_addr="true" join_timeout="3000"
down_thread="false" up_thread="false"
join_retry_timeout="2000" shun="false"
- view_bundling="true"
- view_ack_collection_timeout="5000"/>
- <FC max_credits="2000000" down_thread="false" up_thread="false"
- min_threshold="0.10"/>
- <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
-
- </config>
+ view_bundling="true"/>
+ </config>
</attribute>
<!-- JGroups stack configuration to use for the control channel - used for control messages -->
+ <!-- We use udp stack for the control channel -->
<attribute name="ControlChannelConfig">
<config>
<UDP
- mcast_addr="228.8.8.8"
+ mcast_addr="${jboss.messaging.controlchanneludpaddress:228.7.7.7}"
mcast_port="${jboss.messaging.controlchanneludpport:45568}"
tos="8"
ucast_recv_buf_size="20000000"
@@ -244,7 +240,7 @@
<pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/>
<pbcast.FLUSH down_thread="false" up_thread="false" timeout="20000" auto_flush_conf="false"/>
</config>
- </attribute>
+ </attribute>
</mbean>
<!-- Messaging JMS User Manager MBean config
Modified: trunk/src/etc/server/default/deploy/mssql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/mssql-persistence-service.xml 2007-10-31 01:23:04 UTC (rev 3263)
+++ trunk/src/etc/server/default/deploy/mssql-persistence-service.xml 2007-10-31 11:42:28 UTC (rev 3264)
@@ -153,60 +153,56 @@
<!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
- <attribute name="DataChannelConfig">
+ <!-- By default we use the TCP stack for data -->
+ <attribute name="DataChannelConfig">
<config>
- <UDP
- mcast_addr="228.8.8.8"
- mcast_port="${jboss.messaging.datachanneludpport:45567}"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
- loopback="false"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- use_outgoing_packet_handler="false"
- ip_ttl="2"
- down_thread="false" up_thread="false"
- enable_bundling="false"/>
- <PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/>
- <MERGE2 max_interval="100000" down_thread="false" min_interval="20000" up_thread="false"/>
- <FD_SOCK down_thread="false" up_thread="false"/>
- <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+ <TCP start_port="7900"
+ loopback="true"
+ recv_buf_size="20000000"
+ send_buf_size="640000"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ use_outgoing_packet_handler="false"
+ down_thread="false" up_thread="false"
+ enable_bundling="false"
+ use_send_queues="false"
+ sock_conn_timeout="300"
+ skip_suspected_members="true"/>
+ <MPING timeout="4000"
+ bind_to_all_interfaces="true"
+ mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
+ mcast_port="${jboss.messaging.datachanneludpport:45567}"
+ ip_ttl="8"
+ num_initial_members="2"
+ num_ping_requests="1"/>
+ <MERGE2 max_interval="100000"
+ down_thread="false" up_thread="false" min_interval="20000"/>
+ <FD_SOCK down_thread="false" up_thread="false"/>
<VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
- <pbcast.NAKACK
- max_xmit_size="60000"
- use_mcast_xmit="false"
- gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- down_thread="false" up_thread="false"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"
- down_thread="false" up_thread="false"/>
+ <pbcast.NAKACK max_xmit_size="60000"
+ use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ down_thread="false" up_thread="false"
+ discard_delivered_msgs="true"/>
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
down_thread="false" up_thread="false"
max_bytes="400000"/>
<pbcast.GMS print_local_addr="true" join_timeout="3000"
down_thread="false" up_thread="false"
join_retry_timeout="2000" shun="false"
- view_bundling="true"
- view_ack_collection_timeout="5000"/>
- <FC max_credits="2000000" down_thread="false" up_thread="false"
- min_threshold="0.10"/>
- <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
-
- </config>
+ view_bundling="true"/>
+ </config>
</attribute>
<!-- JGroups stack configuration to use for the control channel - used for control messages -->
+ <!-- We use udp stack for the control channel -->
<attribute name="ControlChannelConfig">
<config>
<UDP
- mcast_addr="228.8.8.8"
+ mcast_addr="${jboss.messaging.controlchanneludpaddress:228.7.7.7}"
mcast_port="${jboss.messaging.controlchanneludpport:45568}"
tos="8"
ucast_recv_buf_size="20000000"
Modified: trunk/src/etc/server/default/deploy/mysql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/mysql-persistence-service.xml 2007-10-31 01:23:04 UTC (rev 3263)
+++ trunk/src/etc/server/default/deploy/mysql-persistence-service.xml 2007-10-31 11:42:28 UTC (rev 3264)
@@ -140,73 +140,58 @@
<attribute name="CastTimeout">50000</attribute>
- <!-- Max number of concurrent replications -->
-
- <attribute name="MaxConcurrentReplications">50</attribute>
-
- <!--
- <attribute name="ChannelFactoryName">jgroups.mux:name=Multiplexer</attribute>
- <attribute name="ControlChannelName">udp-sync</attribute>
- <attribute name="DataChannelName">udp</attribute>
- <attribute name="ChannelPartitionName">${jboss.partition.name:DefaultPartition}-JMS</attribute>
- -->
-
<!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
-
- <attribute name="DataChannelConfig">
+
+ <!-- By default we use the TCP stack for data -->
+ <attribute name="DataChannelConfig">
<config>
- <UDP
- mcast_addr="228.8.8.8"
- mcast_port="${jboss.messaging.datachanneludpport:45567}"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
- loopback="false"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- use_outgoing_packet_handler="false"
- ip_ttl="2"
- down_thread="false" up_thread="false"
- enable_bundling="false"/>
- <PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/>
- <MERGE2 max_interval="100000" down_thread="false" min_interval="20000" up_thread="false"/>
- <FD_SOCK down_thread="false" up_thread="false"/>
- <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+ <TCP start_port="7900"
+ loopback="true"
+ recv_buf_size="20000000"
+ send_buf_size="640000"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ use_outgoing_packet_handler="false"
+ down_thread="false" up_thread="false"
+ enable_bundling="false"
+ use_send_queues="false"
+ sock_conn_timeout="300"
+ skip_suspected_members="true"/>
+ <MPING timeout="4000"
+ bind_to_all_interfaces="true"
+ mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
+ mcast_port="${jboss.messaging.datachanneludpport:45567}"
+ ip_ttl="8"
+ num_initial_members="2"
+ num_ping_requests="1"/>
+ <MERGE2 max_interval="100000"
+ down_thread="false" up_thread="false" min_interval="20000"/>
+ <FD_SOCK down_thread="false" up_thread="false"/>
<VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
- <pbcast.NAKACK
- max_xmit_size="60000"
- use_mcast_xmit="false"
- gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- down_thread="false" up_thread="false"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"
- down_thread="false" up_thread="false"/>
+ <pbcast.NAKACK max_xmit_size="60000"
+ use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ down_thread="false" up_thread="false"
+ discard_delivered_msgs="true"/>
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
down_thread="false" up_thread="false"
max_bytes="400000"/>
<pbcast.GMS print_local_addr="true" join_timeout="3000"
down_thread="false" up_thread="false"
join_retry_timeout="2000" shun="false"
- view_bundling="true"
- view_ack_collection_timeout="5000"/>
- <FC max_credits="2000000" down_thread="false" up_thread="false"
- min_threshold="0.10"/>
- <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
-
- </config>
+ view_bundling="true"/>
+ </config>
</attribute>
<!-- JGroups stack configuration to use for the control channel - used for control messages -->
+ <!-- We use udp stack for the control channel -->
<attribute name="ControlChannelConfig">
<config>
<UDP
- mcast_addr="228.8.8.8"
+ mcast_addr="${jboss.messaging.controlchanneludpaddress:228.7.7.7}"
mcast_port="${jboss.messaging.controlchanneludpport:45568}"
tos="8"
ucast_recv_buf_size="20000000"
@@ -247,7 +232,7 @@
<pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/>
<pbcast.FLUSH down_thread="false" up_thread="false" timeout="20000" auto_flush_conf="false"/>
</config>
- </attribute>
+ </attribute>
</mbean>
Modified: trunk/src/etc/server/default/deploy/mysqlcluster-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/mysqlcluster-persistence-service.xml 2007-10-31 01:23:04 UTC (rev 3263)
+++ trunk/src/etc/server/default/deploy/mysqlcluster-persistence-service.xml 2007-10-31 11:42:28 UTC (rev 3264)
@@ -153,60 +153,56 @@
<!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
- <attribute name="DataChannelConfig">
+ <!-- By default we use the TCP stack for data -->
+ <attribute name="DataChannelConfig">
<config>
- <UDP
- mcast_addr="228.8.8.8"
- mcast_port="${jboss.messaging.datachanneludpport:45567}"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
- loopback="false"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- use_outgoing_packet_handler="false"
- ip_ttl="2"
- down_thread="false" up_thread="false"
- enable_bundling="false"/>
- <PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/>
- <MERGE2 max_interval="100000" down_thread="false" min_interval="20000" up_thread="false"/>
- <FD_SOCK down_thread="false" up_thread="false"/>
- <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+ <TCP start_port="7900"
+ loopback="true"
+ recv_buf_size="20000000"
+ send_buf_size="640000"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ use_outgoing_packet_handler="false"
+ down_thread="false" up_thread="false"
+ enable_bundling="false"
+ use_send_queues="false"
+ sock_conn_timeout="300"
+ skip_suspected_members="true"/>
+ <MPING timeout="4000"
+ bind_to_all_interfaces="true"
+ mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
+ mcast_port="${jboss.messaging.datachanneludpport:45567}"
+ ip_ttl="8"
+ num_initial_members="2"
+ num_ping_requests="1"/>
+ <MERGE2 max_interval="100000"
+ down_thread="false" up_thread="false" min_interval="20000"/>
+ <FD_SOCK down_thread="false" up_thread="false"/>
<VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
- <pbcast.NAKACK
- max_xmit_size="60000"
- use_mcast_xmit="false"
- gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- down_thread="false" up_thread="false"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"
- down_thread="false" up_thread="false"/>
+ <pbcast.NAKACK max_xmit_size="60000"
+ use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ down_thread="false" up_thread="false"
+ discard_delivered_msgs="true"/>
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
down_thread="false" up_thread="false"
max_bytes="400000"/>
<pbcast.GMS print_local_addr="true" join_timeout="3000"
down_thread="false" up_thread="false"
join_retry_timeout="2000" shun="false"
- view_bundling="true"
- view_ack_collection_timeout="5000"/>
- <FC max_credits="2000000" down_thread="false" up_thread="false"
- min_threshold="0.10"/>
- <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
-
- </config>
+ view_bundling="true"/>
+ </config>
</attribute>
<!-- JGroups stack configuration to use for the control channel - used for control messages -->
+ <!-- We use udp stack for the control channel -->
<attribute name="ControlChannelConfig">
<config>
<UDP
- mcast_addr="228.8.8.8"
+ mcast_addr="${jboss.messaging.controlchanneludpaddress:228.7.7.7}"
mcast_port="${jboss.messaging.controlchanneludpport:45568}"
tos="8"
ucast_recv_buf_size="20000000"
@@ -247,7 +243,7 @@
<pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/>
<pbcast.FLUSH down_thread="false" up_thread="false" timeout="20000" auto_flush_conf="false"/>
</config>
- </attribute>
+ </attribute>
</mbean>
Modified: trunk/src/etc/server/default/deploy/oracle-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/oracle-persistence-service.xml 2007-10-31 01:23:04 UTC (rev 3263)
+++ trunk/src/etc/server/default/deploy/oracle-persistence-service.xml 2007-10-31 11:42:28 UTC (rev 3264)
@@ -157,60 +157,56 @@
<!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
- <attribute name="DataChannelConfig">
+ <!-- By default we use the TCP stack for data -->
+ <attribute name="DataChannelConfig">
<config>
- <UDP
- mcast_addr="228.8.8.8"
- mcast_port="${jboss.messaging.datachanneludpport:45567}"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
- loopback="false"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- use_outgoing_packet_handler="false"
- ip_ttl="2"
- down_thread="false" up_thread="false"
- enable_bundling="false"/>
- <PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/>
- <MERGE2 max_interval="100000" down_thread="false" min_interval="20000" up_thread="false"/>
- <FD_SOCK down_thread="false" up_thread="false"/>
- <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+ <TCP start_port="7900"
+ loopback="true"
+ recv_buf_size="20000000"
+ send_buf_size="640000"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ use_outgoing_packet_handler="false"
+ down_thread="false" up_thread="false"
+ enable_bundling="false"
+ use_send_queues="false"
+ sock_conn_timeout="300"
+ skip_suspected_members="true"/>
+ <MPING timeout="4000"
+ bind_to_all_interfaces="true"
+ mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
+ mcast_port="${jboss.messaging.datachanneludpport:45567}"
+ ip_ttl="8"
+ num_initial_members="2"
+ num_ping_requests="1"/>
+ <MERGE2 max_interval="100000"
+ down_thread="false" up_thread="false" min_interval="20000"/>
+ <FD_SOCK down_thread="false" up_thread="false"/>
<VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
- <pbcast.NAKACK
- max_xmit_size="60000"
- use_mcast_xmit="false"
- gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- down_thread="false" up_thread="false"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"
- down_thread="false" up_thread="false"/>
+ <pbcast.NAKACK max_xmit_size="60000"
+ use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ down_thread="false" up_thread="false"
+ discard_delivered_msgs="true"/>
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
down_thread="false" up_thread="false"
max_bytes="400000"/>
<pbcast.GMS print_local_addr="true" join_timeout="3000"
down_thread="false" up_thread="false"
join_retry_timeout="2000" shun="false"
- view_bundling="true"
- view_ack_collection_timeout="5000"/>
- <FC max_credits="2000000" down_thread="false" up_thread="false"
- min_threshold="0.10"/>
- <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
-
- </config>
+ view_bundling="true"/>
+ </config>
</attribute>
<!-- JGroups stack configuration to use for the control channel - used for control messages -->
+ <!-- We use udp stack for the control channel -->
<attribute name="ControlChannelConfig">
<config>
<UDP
- mcast_addr="228.8.8.8"
+ mcast_addr="${jboss.messaging.controlchanneludpaddress:228.7.7.7}"
mcast_port="${jboss.messaging.controlchanneludpport:45568}"
tos="8"
ucast_recv_buf_size="20000000"
@@ -251,7 +247,7 @@
<pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/>
<pbcast.FLUSH down_thread="false" up_thread="false" timeout="20000" auto_flush_conf="false"/>
</config>
- </attribute>
+ </attribute>
</mbean>
<!-- Messaging JMS User Manager MBean config
Modified: trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml 2007-10-31 01:23:04 UTC (rev 3263)
+++ trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml 2007-10-31 11:42:28 UTC (rev 3264)
@@ -153,60 +153,56 @@
<!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
- <attribute name="DataChannelConfig">
+ <!-- By default we use the TCP stack for data -->
+ <attribute name="DataChannelConfig">
<config>
- <UDP
- mcast_addr="228.8.8.8"
- mcast_port="${jboss.messaging.datachanneludpport:45567}"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
- loopback="false"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- use_outgoing_packet_handler="false"
- ip_ttl="2"
- down_thread="false" up_thread="false"
- enable_bundling="false"/>
- <PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/>
- <MERGE2 max_interval="100000" down_thread="false" min_interval="20000" up_thread="false"/>
- <FD_SOCK down_thread="false" up_thread="false"/>
- <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+ <TCP start_port="7900"
+ loopback="true"
+ recv_buf_size="20000000"
+ send_buf_size="640000"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ use_outgoing_packet_handler="false"
+ down_thread="false" up_thread="false"
+ enable_bundling="false"
+ use_send_queues="false"
+ sock_conn_timeout="300"
+ skip_suspected_members="true"/>
+ <MPING timeout="4000"
+ bind_to_all_interfaces="true"
+ mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
+ mcast_port="${jboss.messaging.datachanneludpport:45567}"
+ ip_ttl="8"
+ num_initial_members="2"
+ num_ping_requests="1"/>
+ <MERGE2 max_interval="100000"
+ down_thread="false" up_thread="false" min_interval="20000"/>
+ <FD_SOCK down_thread="false" up_thread="false"/>
<VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
- <pbcast.NAKACK
- max_xmit_size="60000"
- use_mcast_xmit="false"
- gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- down_thread="false" up_thread="false"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"
- down_thread="false" up_thread="false"/>
+ <pbcast.NAKACK max_xmit_size="60000"
+ use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ down_thread="false" up_thread="false"
+ discard_delivered_msgs="true"/>
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
down_thread="false" up_thread="false"
max_bytes="400000"/>
<pbcast.GMS print_local_addr="true" join_timeout="3000"
down_thread="false" up_thread="false"
join_retry_timeout="2000" shun="false"
- view_bundling="true"
- view_ack_collection_timeout="5000"/>
- <FC max_credits="2000000" down_thread="false" up_thread="false"
- min_threshold="0.10"/>
- <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
-
- </config>
+ view_bundling="true"/>
+ </config>
</attribute>
<!-- JGroups stack configuration to use for the control channel - used for control messages -->
+ <!-- We use udp stack for the control channel -->
<attribute name="ControlChannelConfig">
<config>
<UDP
- mcast_addr="228.8.8.8"
+ mcast_addr="${jboss.messaging.controlchanneludpaddress:228.7.7.7}"
mcast_port="${jboss.messaging.controlchanneludpport:45568}"
tos="8"
ucast_recv_buf_size="20000000"
@@ -247,7 +243,7 @@
<pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/>
<pbcast.FLUSH down_thread="false" up_thread="false" timeout="20000" auto_flush_conf="false"/>
</config>
- </attribute>
+ </attribute>
</mbean>
<!-- Messaging JMS User Manager MBean config
Modified: trunk/src/etc/server/default/deploy/sybase-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/sybase-persistence-service.xml 2007-10-31 01:23:04 UTC (rev 3263)
+++ trunk/src/etc/server/default/deploy/sybase-persistence-service.xml 2007-10-31 11:42:28 UTC (rev 3264)
@@ -158,60 +158,56 @@
<!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
- <attribute name="DataChannelConfig">
+ <!-- By default we use the TCP stack for data -->
+ <attribute name="DataChannelConfig">
<config>
- <UDP
- mcast_addr="228.8.8.8"
- mcast_port="${jboss.messaging.datachanneludpport:45567}"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
- loopback="false"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- use_outgoing_packet_handler="false"
- ip_ttl="2"
- down_thread="false" up_thread="false"
- enable_bundling="false"/>
- <PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/>
- <MERGE2 max_interval="100000" down_thread="false" min_interval="20000" up_thread="false"/>
- <FD_SOCK down_thread="false" up_thread="false"/>
- <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+ <TCP start_port="7900"
+ loopback="true"
+ recv_buf_size="20000000"
+ send_buf_size="640000"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ use_outgoing_packet_handler="false"
+ down_thread="false" up_thread="false"
+ enable_bundling="false"
+ use_send_queues="false"
+ sock_conn_timeout="300"
+ skip_suspected_members="true"/>
+ <MPING timeout="4000"
+ bind_to_all_interfaces="true"
+ mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
+ mcast_port="${jboss.messaging.datachanneludpport:45567}"
+ ip_ttl="8"
+ num_initial_members="2"
+ num_ping_requests="1"/>
+ <MERGE2 max_interval="100000"
+ down_thread="false" up_thread="false" min_interval="20000"/>
+ <FD_SOCK down_thread="false" up_thread="false"/>
<VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
- <pbcast.NAKACK
- max_xmit_size="60000"
- use_mcast_xmit="false"
- gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- down_thread="false" up_thread="false"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"
- down_thread="false" up_thread="false"/>
+ <pbcast.NAKACK max_xmit_size="60000"
+ use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ down_thread="false" up_thread="false"
+ discard_delivered_msgs="true"/>
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
down_thread="false" up_thread="false"
max_bytes="400000"/>
<pbcast.GMS print_local_addr="true" join_timeout="3000"
down_thread="false" up_thread="false"
join_retry_timeout="2000" shun="false"
- view_bundling="true"
- view_ack_collection_timeout="5000"/>
- <FC max_credits="2000000" down_thread="false" up_thread="false"
- min_threshold="0.10"/>
- <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
-
- </config>
+ view_bundling="true"/>
+ </config>
</attribute>
<!-- JGroups stack configuration to use for the control channel - used for control messages -->
+ <!-- We use udp stack for the control channel -->
<attribute name="ControlChannelConfig">
<config>
<UDP
- mcast_addr="228.8.8.8"
+ mcast_addr="${jboss.messaging.controlchanneludpaddress:228.7.7.7}"
mcast_port="${jboss.messaging.controlchanneludpport:45568}"
tos="8"
ucast_recv_buf_size="20000000"
@@ -252,7 +248,7 @@
<pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/>
<pbcast.FLUSH down_thread="false" up_thread="false" timeout="20000" auto_flush_conf="false"/>
</config>
- </attribute>
+ </attribute>
</mbean>
<!-- Messaging JMS User Manager MBean config
Modified: trunk/src/main/org/jboss/messaging/util/XMLUtil.java
===================================================================
--- trunk/src/main/org/jboss/messaging/util/XMLUtil.java 2007-10-31 01:23:04 UTC (rev 3263)
+++ trunk/src/main/org/jboss/messaging/util/XMLUtil.java 2007-10-31 11:42:28 UTC (rev 3264)
@@ -58,10 +58,11 @@
buff.append((char)c);
}
- //Quick hardcoded replace, TODO this can be done better
+ //Quick hardcoded replace, FIXME this is a kludge - use regexp to match properly
String s = buff.toString();
-
s = doReplace(s, "jboss.messaging.groupname", "MessagingPostOffice");
+ s = doReplace(s, "jboss.messaging.datachanneludpaddress", "228.6.6.6");
+ s = doReplace(s, "jboss.messaging.controlchanneludpaddress", "228.7.7.7");
s = doReplace(s, "jboss.messaging.datachanneludpport", "45567");
s = doReplace(s, "jboss.messaging.controlchanneludpport", "45568");
Modified: trunk/tests/src/org/jboss/test/messaging/jms/stress/OpenCloseStressTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/stress/OpenCloseStressTest.java 2007-10-31 01:23:04 UTC (rev 3263)
+++ trunk/tests/src/org/jboss/test/messaging/jms/stress/OpenCloseStressTest.java 2007-10-31 11:42:28 UTC (rev 3264)
@@ -114,19 +114,19 @@
conn1 = cf.createConnection();
Session sess1 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer prod1 = sess1.createProducer(topic);
- prod1.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+ prod1.setDeliveryMode(DeliveryMode.PERSISTENT);
publishers[0] = new Publisher(sess1, prod1, MSGS_PER_PUBLISHER, 2);
conn2 = cf.createConnection();
Session sess2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer prod2 = sess2.createProducer(topic);
- prod2.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+ prod2.setDeliveryMode(DeliveryMode.PERSISTENT);
publishers[1] = new Publisher(sess2, prod2, MSGS_PER_PUBLISHER, 5);
conn3 = cf.createConnection();
Session sess3 = conn3.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer prod3 = sess3.createProducer(topic);
- prod3.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+ prod3.setDeliveryMode(DeliveryMode.PERSISTENT);
publishers[2] = new Publisher(sess3, prod3, MSGS_PER_PUBLISHER, 1);
Subscriber[] subscribers = new Subscriber[5];
@@ -172,7 +172,7 @@
threads[i].start();
}
- // Pause before creating producers otherwise subscribers might not get all messages
+ // Pause before creating producers otherwise subscribers to make sure they're all created
Thread.sleep(5000);
@@ -199,16 +199,14 @@
//there is a period of time after closing the previous session and starting the next one
//when messages are being sent and won't be received (since there is no consumer)
}
-
-
+
assertFalse(subscribers[i].isFailed());
}
for (int i = 0; i < publishers.length; i++)
{
assertFalse(publishers[i].isFailed());
- }
-
+ }
}
finally
{
Modified: trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2007-10-31 01:23:04 UTC (rev 3263)
+++ trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2007-10-31 11:42:28 UTC (rev 3264)
@@ -456,6 +456,20 @@
sb.append("-Djboss.messaging.controlchanneludpport=").append(controlChannelUDPPort).append(' ');
}
+ String dataChannelUDPAddress = System.getProperty("jboss.messaging.datachanneludpaddress");
+ log.info("*** data UDP address is " + dataChannelUDPAddress);
+ if (dataChannelUDPAddress != null)
+ {
+ sb.append("-Djboss.messaging.datachanneludpaddress=").append(dataChannelUDPAddress).append(' ');
+ }
+
+ String controlChannelUDPAddress = System.getProperty("jboss.messaging.controlchanneludpaddress");
+ log.info("*** control UDP address is " + controlChannelUDPAddress);
+ if (controlChannelUDPAddress != null)
+ {
+ sb.append("-Djboss.messaging.controlchanneludpaddress=").append(controlChannelUDPAddress).append(' ');
+ }
+
String testLogfileSuffix = System.getProperty("test.logfile.suffix");
if (testLogfileSuffix == null)
More information about the jboss-cvs-commits
mailing list