[jboss-cvs] JBoss Messaging SVN: r3924 - in branches/Branch_Stable/src: etc/xmdesc and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 25 09:03:20 EDT 2008
Author: timfox
Date: 2008-03-25 09:03:20 -0400 (Tue, 25 Mar 2008)
New Revision: 3924
Modified:
branches/Branch_Stable/src/etc/server/default/deploy/clustered-hsqldb-persistence-service.xml
branches/Branch_Stable/src/etc/server/default/deploy/mssql-persistence-service.xml
branches/Branch_Stable/src/etc/server/default/deploy/mysql-clustered-persistence-service.xml
branches/Branch_Stable/src/etc/server/default/deploy/mysql-persistence-service.xml
branches/Branch_Stable/src/etc/server/default/deploy/null-persistence-service.xml
branches/Branch_Stable/src/etc/server/default/deploy/oracle-persistence-service.xml
branches/Branch_Stable/src/etc/server/default/deploy/postgresql-persistence-service.xml
branches/Branch_Stable/src/etc/server/default/deploy/sybase-persistence-service.xml
branches/Branch_Stable/src/etc/xmdesc/MessagingPostOffice-xmbean.xml
branches/Branch_Stable/src/main/org/jboss/jms/client/container/ClusteringAspect.java
branches/Branch_Stable/src/main/org/jboss/jms/server/ServerPeer.java
branches/Branch_Stable/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
branches/Branch_Stable/src/main/org/jboss/messaging/core/jmx/MessagingPostOfficeService.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-1230
Modified: branches/Branch_Stable/src/etc/server/default/deploy/clustered-hsqldb-persistence-service.xml
===================================================================
--- branches/Branch_Stable/src/etc/server/default/deploy/clustered-hsqldb-persistence-service.xml 2008-03-25 12:56:30 UTC (rev 3923)
+++ branches/Branch_Stable/src/etc/server/default/deploy/clustered-hsqldb-persistence-service.xml 2008-03-25 13:03:20 UTC (rev 3924)
@@ -83,7 +83,11 @@
<!-- Max time to wait for a synchronous call to node members using the MessageDispatcher -->
<attribute name="CastTimeout">50000</attribute>
-
+
+ <!-- Set this to true if you want failover of connections to occur when a node is shut down -->
+
+ <attribute name="FailoverOnNodeLeave">false</attribute>
+
<!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
<!-- By default we use the TCP stack for data -->
Modified: branches/Branch_Stable/src/etc/server/default/deploy/mssql-persistence-service.xml
===================================================================
--- branches/Branch_Stable/src/etc/server/default/deploy/mssql-persistence-service.xml 2008-03-25 12:56:30 UTC (rev 3923)
+++ branches/Branch_Stable/src/etc/server/default/deploy/mssql-persistence-service.xml 2008-03-25 13:03:20 UTC (rev 3924)
@@ -145,129 +145,133 @@
<!-- Max time to wait for a synchronous call to node members using the MessageDispatcher -->
<attribute name="CastTimeout">30000</attribute>
-
+
+ <!-- Set this to true if you want failover of connections to occur when a node is shut down -->
+
+ <attribute name="FailoverOnNodeLeave">false</attribute>
+
<!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
- <!-- By default we use the TCP stack for data -->
- <attribute name="DataChannelConfig">
- <config>
- <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"
- enable_bundling="false"
- use_send_queues="false"
- sock_conn_timeout="300"
- skip_suspected_members="true"
- use_concurrent_stack="true"
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="200"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="500"
- thread_pool.rejection_policy="run"
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="100"
- oob_thread_pool.keep_alive_time="5000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="100"
- oob_thread_pool.rejection_policy="run"/>
- <MPING timeout="5000"
- mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
- mcast_port="${jboss.messaging.datachanneludpport:45567}"
- ip_ttl="${jboss.messaging.ipttl:8}"
- num_initial_members="5"
- num_ping_requests="3"/>
- <MERGE2 max_interval="100000" min_interval="20000"/>
- <FD_SOCK/>
- <VERIFY_SUSPECT timeout="1500"/>
- <BARRIER/>
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <VIEW_SYNC avg_send_interval="10000"/>
-
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
- shun="false" 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="${jboss.messaging.controlchanneludpaddress:228.7.7.7}"
- mcast_port="${jboss.messaging.controlchanneludpport:45568}"
- 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"
- ip_ttl="${jboss.messaging.ipttl:8}"
- enable_bundling="false"
- enable_diagnostics="true"
- thread_naming_pattern="cl"
-
- use_concurrent_stack="true"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="200"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="1000"
- thread_pool.rejection_policy="Run"
-
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="8"
- oob_thread_pool.keep_alive_time="5000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="100"
- oob_thread_pool.rejection_policy="Run"/>
- <PING timeout="2000"
- num_initial_members="3"/>
- <MERGE2 max_interval="100000"
- min_interval="20000"/>
- <FD_SOCK />
- <FD timeout="10000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500" />
- <BARRIER />
- <pbcast.NAKACK use_stats_for_retransmission="false"
- exponential_backoff="150"
- use_mcast_xmit="true" gc_lag="0"
- retransmit_timeout="50,300,600,1200"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <VIEW_SYNC avg_send_interval="10000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
- shun="false"
- view_bundling="true"/>
- <FC max_credits="500000"
- min_threshold="0.20"/>
- <FRAG2 frag_size="60000" />
- <pbcast.STATE_TRANSFER/>
- <pbcast.FLUSH timeout="20000"/>
- </config>
- </attribute>
+ <!-- By default we use the TCP stack for data -->
+ <attribute name="DataChannelConfig">
+ <config>
+ <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"
+ enable_bundling="false"
+ use_send_queues="false"
+ sock_conn_timeout="300"
+ skip_suspected_members="true"
+ use_concurrent_stack="true"
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="200"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="500"
+ thread_pool.rejection_policy="run"
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="100"
+ oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="100"
+ oob_thread_pool.rejection_policy="run"/>
+ <MPING timeout="5000"
+ mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
+ mcast_port="${jboss.messaging.datachanneludpport:45567}"
+ ip_ttl="${jboss.messaging.ipttl:8}"
+ num_initial_members="5"
+ num_ping_requests="3"/>
+ <MERGE2 max_interval="100000" min_interval="20000"/>
+ <FD_SOCK/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <BARRIER/>
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,1200,2400,3600"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <VIEW_SYNC avg_send_interval="10000"/>
+
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+ shun="false" 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="${jboss.messaging.controlchanneludpaddress:228.7.7.7}"
+ mcast_port="${jboss.messaging.controlchanneludpport:45568}"
+ 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"
+ ip_ttl="${jboss.messaging.ipttl:8}"
+ enable_bundling="false"
+ enable_diagnostics="true"
+ thread_naming_pattern="cl"
+
+ use_concurrent_stack="true"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="200"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="1000"
+ thread_pool.rejection_policy="Run"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="100"
+ oob_thread_pool.rejection_policy="Run"/>
+ <PING timeout="2000"
+ num_initial_members="3"/>
+ <MERGE2 max_interval="100000"
+ min_interval="20000"/>
+ <FD_SOCK />
+ <FD timeout="10000" max_tries="5" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500" />
+ <BARRIER />
+ <pbcast.NAKACK use_stats_for_retransmission="false"
+ exponential_backoff="150"
+ use_mcast_xmit="true" gc_lag="0"
+ retransmit_timeout="50,300,600,1200"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,1200,2400,3600"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <VIEW_SYNC avg_send_interval="10000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+ shun="false"
+ view_bundling="true"/>
+ <FC max_credits="500000"
+ min_threshold="0.20"/>
+ <FRAG2 frag_size="60000" />
+ <pbcast.STATE_TRANSFER/>
+ <pbcast.FLUSH timeout="20000"/>
+ </config>
+ </attribute>
</mbean>
<!-- Messaging JMS User Manager MBean config
Modified: branches/Branch_Stable/src/etc/server/default/deploy/mysql-clustered-persistence-service.xml
===================================================================
--- branches/Branch_Stable/src/etc/server/default/deploy/mysql-clustered-persistence-service.xml 2008-03-25 12:56:30 UTC (rev 3923)
+++ branches/Branch_Stable/src/etc/server/default/deploy/mysql-clustered-persistence-service.xml 2008-03-25 13:03:20 UTC (rev 3924)
@@ -147,7 +147,11 @@
<!-- Max time to wait for a synchronous call to node members using the MessageDispatcher -->
<attribute name="CastTimeout">300000</attribute>
-
+
+ <!-- Set this to true if you want failover of connections to occur when a node is shut down -->
+
+ <attribute name="FailoverOnNodeLeave">false</attribute>
+
<!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
<!-- By default we use the TCP stack for data -->
Modified: branches/Branch_Stable/src/etc/server/default/deploy/mysql-persistence-service.xml
===================================================================
--- branches/Branch_Stable/src/etc/server/default/deploy/mysql-persistence-service.xml 2008-03-25 12:56:30 UTC (rev 3923)
+++ branches/Branch_Stable/src/etc/server/default/deploy/mysql-persistence-service.xml 2008-03-25 13:03:20 UTC (rev 3924)
@@ -145,6 +145,10 @@
<!-- Max time to wait for a synchronous call to node members using the MessageDispatcher -->
<attribute name="CastTimeout">300000</attribute>
+
+ <!-- Set this to true if you want failover of connections to occur when a node is shut down -->
+
+ <attribute name="FailoverOnNodeLeave">false</attribute>
<!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
Modified: branches/Branch_Stable/src/etc/server/default/deploy/null-persistence-service.xml
===================================================================
--- branches/Branch_Stable/src/etc/server/default/deploy/null-persistence-service.xml 2008-03-25 12:56:30 UTC (rev 3923)
+++ branches/Branch_Stable/src/etc/server/default/deploy/null-persistence-service.xml 2008-03-25 13:03:20 UTC (rev 3924)
@@ -48,7 +48,11 @@
<!-- Max time to wait for a synchronous call to node members using the MessageDispatcher -->
<attribute name="CastTimeout">300000</attribute>
-
+
+ <!-- Set this to true if you want failover of connections to occur when a node is shut down -->
+
+ <attribute name="FailoverOnNodeLeave">false</attribute>
+
<!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
<!-- By default we use the TCP stack for data -->
Modified: branches/Branch_Stable/src/etc/server/default/deploy/oracle-persistence-service.xml
===================================================================
--- branches/Branch_Stable/src/etc/server/default/deploy/oracle-persistence-service.xml 2008-03-25 12:56:30 UTC (rev 3923)
+++ branches/Branch_Stable/src/etc/server/default/deploy/oracle-persistence-service.xml 2008-03-25 13:03:20 UTC (rev 3924)
@@ -149,129 +149,133 @@
<!-- Max time to wait for a synchronous call to node members using the MessageDispatcher -->
<attribute name="CastTimeout">30000</attribute>
-
+
+ <!-- Set this to true if you want failover of connections to occur when a node is shut down -->
+
+ <attribute name="FailoverOnNodeLeave">false</attribute>
+
<!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
- <!-- By default we use the TCP stack for data -->
- <attribute name="DataChannelConfig">
- <config>
- <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"
- enable_bundling="false"
- use_send_queues="false"
- sock_conn_timeout="300"
- skip_suspected_members="true"
- use_concurrent_stack="true"
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="200"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="500"
- thread_pool.rejection_policy="run"
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="100"
- oob_thread_pool.keep_alive_time="5000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="100"
- oob_thread_pool.rejection_policy="run"/>
- <MPING timeout="5000"
- mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
- mcast_port="${jboss.messaging.datachanneludpport:45567}"
- ip_ttl="${jboss.messaging.ipttl:8}"
- num_initial_members="5"
- num_ping_requests="3"/>
- <MERGE2 max_interval="100000" min_interval="20000"/>
- <FD_SOCK/>
- <VERIFY_SUSPECT timeout="1500"/>
- <BARRIER/>
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <VIEW_SYNC avg_send_interval="10000"/>
-
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
- shun="false" 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="${jboss.messaging.controlchanneludpaddress:228.7.7.7}"
- mcast_port="${jboss.messaging.controlchanneludpport:45568}"
- 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"
- ip_ttl="${jboss.messaging.ipttl:8}"
- enable_bundling="false"
- enable_diagnostics="true"
- thread_naming_pattern="cl"
-
- use_concurrent_stack="true"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="200"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="1000"
- thread_pool.rejection_policy="Run"
-
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="8"
- oob_thread_pool.keep_alive_time="5000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="100"
- oob_thread_pool.rejection_policy="Run"/>
- <PING timeout="2000"
- num_initial_members="3"/>
- <MERGE2 max_interval="100000"
- min_interval="20000"/>
- <FD_SOCK />
- <FD timeout="10000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500" />
- <BARRIER />
- <pbcast.NAKACK use_stats_for_retransmission="false"
- exponential_backoff="150"
- use_mcast_xmit="true" gc_lag="0"
- retransmit_timeout="50,300,600,1200"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <VIEW_SYNC avg_send_interval="10000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
- shun="false"
- view_bundling="true"/>
- <FC max_credits="500000"
- min_threshold="0.20"/>
- <FRAG2 frag_size="60000" />
- <pbcast.STATE_TRANSFER/>
- <pbcast.FLUSH timeout="20000"/>
- </config>
- </attribute>
+ <!-- By default we use the TCP stack for data -->
+ <attribute name="DataChannelConfig">
+ <config>
+ <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"
+ enable_bundling="false"
+ use_send_queues="false"
+ sock_conn_timeout="300"
+ skip_suspected_members="true"
+ use_concurrent_stack="true"
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="200"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="500"
+ thread_pool.rejection_policy="run"
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="100"
+ oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="100"
+ oob_thread_pool.rejection_policy="run"/>
+ <MPING timeout="5000"
+ mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
+ mcast_port="${jboss.messaging.datachanneludpport:45567}"
+ ip_ttl="${jboss.messaging.ipttl:8}"
+ num_initial_members="5"
+ num_ping_requests="3"/>
+ <MERGE2 max_interval="100000" min_interval="20000"/>
+ <FD_SOCK/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <BARRIER/>
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,1200,2400,3600"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <VIEW_SYNC avg_send_interval="10000"/>
+
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+ shun="false" 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="${jboss.messaging.controlchanneludpaddress:228.7.7.7}"
+ mcast_port="${jboss.messaging.controlchanneludpport:45568}"
+ 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"
+ ip_ttl="${jboss.messaging.ipttl:8}"
+ enable_bundling="false"
+ enable_diagnostics="true"
+ thread_naming_pattern="cl"
+
+ use_concurrent_stack="true"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="200"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="1000"
+ thread_pool.rejection_policy="Run"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="100"
+ oob_thread_pool.rejection_policy="Run"/>
+ <PING timeout="2000"
+ num_initial_members="3"/>
+ <MERGE2 max_interval="100000"
+ min_interval="20000"/>
+ <FD_SOCK />
+ <FD timeout="10000" max_tries="5" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500" />
+ <BARRIER />
+ <pbcast.NAKACK use_stats_for_retransmission="false"
+ exponential_backoff="150"
+ use_mcast_xmit="true" gc_lag="0"
+ retransmit_timeout="50,300,600,1200"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,1200,2400,3600"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <VIEW_SYNC avg_send_interval="10000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+ shun="false"
+ view_bundling="true"/>
+ <FC max_credits="500000"
+ min_threshold="0.20"/>
+ <FRAG2 frag_size="60000" />
+ <pbcast.STATE_TRANSFER/>
+ <pbcast.FLUSH timeout="20000"/>
+ </config>
+ </attribute>
</mbean>
<!-- Messaging JMS User Manager MBean config
Modified: branches/Branch_Stable/src/etc/server/default/deploy/postgresql-persistence-service.xml
===================================================================
--- branches/Branch_Stable/src/etc/server/default/deploy/postgresql-persistence-service.xml 2008-03-25 12:56:30 UTC (rev 3923)
+++ branches/Branch_Stable/src/etc/server/default/deploy/postgresql-persistence-service.xml 2008-03-25 13:03:20 UTC (rev 3924)
@@ -146,139 +146,132 @@
<attribute name="CastTimeout">30000</attribute>
- <!-- Max number of concurrent replications -->
+ <!-- Set this to true if you want failover of connections to occur when a node is shut down -->
+
+ <attribute name="FailoverOnNodeLeave">false</attribute>
- <attribute name="MaxConcurrentReplications">50</attribute>
+ <!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
- <!--
- <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>
- -->
+ <!-- By default we use the TCP stack for data -->
+ <attribute name="DataChannelConfig">
+ <config>
+ <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"
+ enable_bundling="false"
+ use_send_queues="false"
+ sock_conn_timeout="300"
+ skip_suspected_members="true"
+ use_concurrent_stack="true"
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="200"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="500"
+ thread_pool.rejection_policy="run"
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="100"
+ oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="100"
+ oob_thread_pool.rejection_policy="run"/>
+ <MPING timeout="5000"
+ mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
+ mcast_port="${jboss.messaging.datachanneludpport:45567}"
+ ip_ttl="${jboss.messaging.ipttl:8}"
+ num_initial_members="5"
+ num_ping_requests="3"/>
+ <MERGE2 max_interval="100000" min_interval="20000"/>
+ <FD_SOCK/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <BARRIER/>
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,1200,2400,3600"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <VIEW_SYNC avg_send_interval="10000"/>
- <!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+ shun="false" view_bundling="true"/>
+ </config>
+ </attribute>
- <!-- By default we use the TCP stack for data -->
- <attribute name="DataChannelConfig">
- <config>
- <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"
- enable_bundling="false"
- use_send_queues="false"
- sock_conn_timeout="300"
- skip_suspected_members="true"
- use_concurrent_stack="true"
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="200"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="500"
- thread_pool.rejection_policy="run"
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="100"
- oob_thread_pool.keep_alive_time="5000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="100"
- oob_thread_pool.rejection_policy="run"/>
- <MPING timeout="5000"
- mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
- mcast_port="${jboss.messaging.datachanneludpport:45567}"
- ip_ttl="${jboss.messaging.ipttl:8}"
- num_initial_members="5"
- num_ping_requests="3"/>
- <MERGE2 max_interval="100000" min_interval="20000"/>
- <FD_SOCK/>
- <VERIFY_SUSPECT timeout="1500"/>
- <BARRIER/>
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <VIEW_SYNC avg_send_interval="10000"/>
-
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
- shun="false" 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="${jboss.messaging.controlchanneludpaddress:228.7.7.7}"
- mcast_port="${jboss.messaging.controlchanneludpport:45568}"
- 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"
- ip_ttl="${jboss.messaging.ipttl:8}"
- enable_bundling="false"
- enable_diagnostics="true"
- thread_naming_pattern="cl"
-
- use_concurrent_stack="true"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="200"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="1000"
- thread_pool.rejection_policy="Run"
-
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="8"
- oob_thread_pool.keep_alive_time="5000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="100"
- oob_thread_pool.rejection_policy="Run"/>
- <PING timeout="2000"
- num_initial_members="3"/>
- <MERGE2 max_interval="100000"
- min_interval="20000"/>
- <FD_SOCK />
- <FD timeout="10000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500" />
- <BARRIER />
- <pbcast.NAKACK use_stats_for_retransmission="false"
- exponential_backoff="150"
- use_mcast_xmit="true" gc_lag="0"
- retransmit_timeout="50,300,600,1200"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <VIEW_SYNC avg_send_interval="10000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
- shun="false"
- view_bundling="true"/>
- <FC max_credits="500000"
- min_threshold="0.20"/>
- <FRAG2 frag_size="60000" />
- <pbcast.STATE_TRANSFER/>
- <pbcast.FLUSH timeout="20000"/>
- </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="${jboss.messaging.controlchanneludpaddress:228.7.7.7}"
+ mcast_port="${jboss.messaging.controlchanneludpport:45568}"
+ 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"
+ ip_ttl="${jboss.messaging.ipttl:8}"
+ enable_bundling="false"
+ enable_diagnostics="true"
+ thread_naming_pattern="cl"
+
+ use_concurrent_stack="true"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="200"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="1000"
+ thread_pool.rejection_policy="Run"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="100"
+ oob_thread_pool.rejection_policy="Run"/>
+ <PING timeout="2000"
+ num_initial_members="3"/>
+ <MERGE2 max_interval="100000"
+ min_interval="20000"/>
+ <FD_SOCK />
+ <FD timeout="10000" max_tries="5" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500" />
+ <BARRIER />
+ <pbcast.NAKACK use_stats_for_retransmission="false"
+ exponential_backoff="150"
+ use_mcast_xmit="true" gc_lag="0"
+ retransmit_timeout="50,300,600,1200"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,1200,2400,3600"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <VIEW_SYNC avg_send_interval="10000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+ shun="false"
+ view_bundling="true"/>
+ <FC max_credits="500000"
+ min_threshold="0.20"/>
+ <FRAG2 frag_size="60000" />
+ <pbcast.STATE_TRANSFER/>
+ <pbcast.FLUSH timeout="20000"/>
+ </config>
+ </attribute>
</mbean>
<!-- Messaging JMS User Manager MBean config
Modified: branches/Branch_Stable/src/etc/server/default/deploy/sybase-persistence-service.xml
===================================================================
--- branches/Branch_Stable/src/etc/server/default/deploy/sybase-persistence-service.xml 2008-03-25 12:56:30 UTC (rev 3923)
+++ branches/Branch_Stable/src/etc/server/default/deploy/sybase-persistence-service.xml 2008-03-25 13:03:20 UTC (rev 3924)
@@ -150,129 +150,133 @@
<!-- Max time to wait for a synchronous call to node members using the MessageDispatcher -->
<attribute name="CastTimeout">30000</attribute>
-
+
+ <!-- Set this to true if you want failover of connections to occur when a node is shut down -->
+
+ <attribute name="FailoverOnNodeLeave">false</attribute>
+
<!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
- <!-- By default we use the TCP stack for data -->
- <attribute name="DataChannelConfig">
- <config>
- <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"
- enable_bundling="false"
- use_send_queues="false"
- sock_conn_timeout="300"
- skip_suspected_members="true"
- use_concurrent_stack="true"
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="200"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="500"
- thread_pool.rejection_policy="run"
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="100"
- oob_thread_pool.keep_alive_time="5000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="100"
- oob_thread_pool.rejection_policy="run"/>
- <MPING timeout="5000"
- mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
- mcast_port="${jboss.messaging.datachanneludpport:45567}"
- ip_ttl="${jboss.messaging.ipttl:8}"
- num_initial_members="5"
- num_ping_requests="3"/>
- <MERGE2 max_interval="100000" min_interval="20000"/>
- <FD_SOCK/>
- <VERIFY_SUSPECT timeout="1500"/>
- <BARRIER/>
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <VIEW_SYNC avg_send_interval="10000"/>
-
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
- shun="false" 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="${jboss.messaging.controlchanneludpaddress:228.7.7.7}"
- mcast_port="${jboss.messaging.controlchanneludpport:45568}"
- 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"
- ip_ttl="${jboss.messaging.ipttl:8}"
- enable_bundling="false"
- enable_diagnostics="true"
- thread_naming_pattern="cl"
-
- use_concurrent_stack="true"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="200"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="1000"
- thread_pool.rejection_policy="Run"
-
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="8"
- oob_thread_pool.keep_alive_time="5000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="100"
- oob_thread_pool.rejection_policy="Run"/>
- <PING timeout="2000"
- num_initial_members="3"/>
- <MERGE2 max_interval="100000"
- min_interval="20000"/>
- <FD_SOCK />
- <FD timeout="10000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500" />
- <BARRIER />
- <pbcast.NAKACK use_stats_for_retransmission="false"
- exponential_backoff="150"
- use_mcast_xmit="true" gc_lag="0"
- retransmit_timeout="50,300,600,1200"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <VIEW_SYNC avg_send_interval="10000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
- shun="false"
- view_bundling="true"/>
- <FC max_credits="500000"
- min_threshold="0.20"/>
- <FRAG2 frag_size="60000" />
- <pbcast.STATE_TRANSFER/>
- <pbcast.FLUSH timeout="20000"/>
- </config>
- </attribute>
+ <!-- By default we use the TCP stack for data -->
+ <attribute name="DataChannelConfig">
+ <config>
+ <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"
+ enable_bundling="false"
+ use_send_queues="false"
+ sock_conn_timeout="300"
+ skip_suspected_members="true"
+ use_concurrent_stack="true"
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="200"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="500"
+ thread_pool.rejection_policy="run"
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="100"
+ oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="100"
+ oob_thread_pool.rejection_policy="run"/>
+ <MPING timeout="5000"
+ mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
+ mcast_port="${jboss.messaging.datachanneludpport:45567}"
+ ip_ttl="${jboss.messaging.ipttl:8}"
+ num_initial_members="5"
+ num_ping_requests="3"/>
+ <MERGE2 max_interval="100000" min_interval="20000"/>
+ <FD_SOCK/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <BARRIER/>
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,1200,2400,3600"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <VIEW_SYNC avg_send_interval="10000"/>
+
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+ shun="false" 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="${jboss.messaging.controlchanneludpaddress:228.7.7.7}"
+ mcast_port="${jboss.messaging.controlchanneludpport:45568}"
+ 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"
+ ip_ttl="${jboss.messaging.ipttl:8}"
+ enable_bundling="false"
+ enable_diagnostics="true"
+ thread_naming_pattern="cl"
+
+ use_concurrent_stack="true"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="200"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="1000"
+ thread_pool.rejection_policy="Run"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="100"
+ oob_thread_pool.rejection_policy="Run"/>
+ <PING timeout="2000"
+ num_initial_members="3"/>
+ <MERGE2 max_interval="100000"
+ min_interval="20000"/>
+ <FD_SOCK />
+ <FD timeout="10000" max_tries="5" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500" />
+ <BARRIER />
+ <pbcast.NAKACK use_stats_for_retransmission="false"
+ exponential_backoff="150"
+ use_mcast_xmit="true" gc_lag="0"
+ retransmit_timeout="50,300,600,1200"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,1200,2400,3600"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <VIEW_SYNC avg_send_interval="10000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+ shun="false"
+ view_bundling="true"/>
+ <FC max_credits="500000"
+ min_threshold="0.20"/>
+ <FRAG2 frag_size="60000" />
+ <pbcast.STATE_TRANSFER/>
+ <pbcast.FLUSH timeout="20000"/>
+ </config>
+ </attribute>
</mbean>
<!-- Messaging JMS User Manager MBean config
Modified: branches/Branch_Stable/src/etc/xmdesc/MessagingPostOffice-xmbean.xml
===================================================================
--- branches/Branch_Stable/src/etc/xmdesc/MessagingPostOffice-xmbean.xml 2008-03-25 12:56:30 UTC (rev 3923)
+++ branches/Branch_Stable/src/etc/xmdesc/MessagingPostOffice-xmbean.xml 2008-03-25 13:03:20 UTC (rev 3924)
@@ -125,6 +125,12 @@
<type>int</type>
</attribute>
+ <attribute access="read-write" getMethod="isFailoverOnNodeLeave" setMethod="setFailoverOnNodeLeave">
+ <description>If true then failover will occur when a node cleanly leaves the group - i.e. it is cleanly shut down</description>
+ <name>FailoverOnNodeLeave</name>
+ <type>boolean</type>
+ </attribute>
+
<attribute access="read-only" getMethod="getNodeIDView">
<description>Get the set of nodes in the cluster</description>
<name>NodeIDView</name>
Modified: branches/Branch_Stable/src/main/org/jboss/jms/client/container/ClusteringAspect.java
===================================================================
--- branches/Branch_Stable/src/main/org/jboss/jms/client/container/ClusteringAspect.java 2008-03-25 12:56:30 UTC (rev 3923)
+++ branches/Branch_Stable/src/main/org/jboss/jms/client/container/ClusteringAspect.java 2008-03-25 13:03:20 UTC (rev 3924)
@@ -214,9 +214,6 @@
if (delegate == null)
{
- // the delegate corresponding to the actualServerID not found among the cached
- // delegates. TODO Could this ever happen? Should we send back the cf, or update it
- // instead of just the id??
throw new JMSException("Cannot find a cached connection factory delegate for " +
"node " + actualServerID);
}
Modified: branches/Branch_Stable/src/main/org/jboss/jms/server/ServerPeer.java
===================================================================
--- branches/Branch_Stable/src/main/org/jboss/jms/server/ServerPeer.java 2008-03-25 12:56:30 UTC (rev 3923)
+++ branches/Branch_Stable/src/main/org/jboss/jms/server/ServerPeer.java 2008-03-25 13:03:20 UTC (rev 3924)
@@ -350,8 +350,6 @@
return;
}
- log.info(this + " is Stopping. NOTE! Stopping the server peer cleanly will NOT cause failover to occur");
-
started = false;
//Tell the invocation handler we are closed - this is so we don't attempt to handle
Modified: branches/Branch_Stable/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- branches/Branch_Stable/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java 2008-03-25 12:56:30 UTC (rev 3923)
+++ branches/Branch_Stable/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java 2008-03-25 13:03:20 UTC (rev 3924)
@@ -224,6 +224,8 @@
private ClearableSemaphore replicateSemaphore;
private boolean useJGroupsWorkaround;
+
+ private boolean failoverOnNodeLeave;
// Constructors ---------------------------------------------------------------------------------
@@ -292,7 +294,8 @@
ChannelFactory jChannelFactory,
long stateTimeout, long castTimeout,
boolean supportsFailover,
- int maxConcurrentReplications)
+ int maxConcurrentReplications,
+ boolean failoverOnNodeLeave)
throws Exception
{
this(ds, tm, sqlProperties, createTablesOnStartup, nodeId, officeName, ms, pm, tr,
@@ -300,6 +303,8 @@
this.clustered = true;
+ this.failoverOnNodeLeave = failoverOnNodeLeave;
+
groupMember = new GroupMember(groupName, stateTimeout, castTimeout, jChannelFactory, this, this);
this.supportsFailover = supportsFailover;
@@ -915,9 +920,9 @@
{
throw new IllegalStateException(this + " cannot find node ID for address " + address);
}
+
+ boolean crashed = failoverOnNodeLeave || !leaveMessageReceived(leftNodeID);
- boolean crashed = !leaveMessageReceived(leftNodeID);
-
log.debug(this + ": node " + leftNodeID + " has " + (crashed ? "crashed" : "cleanly left the group"));
Integer fnodeID = (Integer)oldFailoverMap.get(leftNodeID);
Modified: branches/Branch_Stable/src/main/org/jboss/messaging/core/jmx/MessagingPostOfficeService.java
===================================================================
--- branches/Branch_Stable/src/main/org/jboss/messaging/core/jmx/MessagingPostOfficeService.java 2008-03-25 12:56:30 UTC (rev 3923)
+++ branches/Branch_Stable/src/main/org/jboss/messaging/core/jmx/MessagingPostOfficeService.java 2008-03-25 13:03:20 UTC (rev 3924)
@@ -97,6 +97,8 @@
private boolean clustered;
private int maxConcurrentReplications = 25;
+
+ private boolean failoverOnNodeLeave;
private MessagingPostOffice postOffice;
@@ -314,9 +316,30 @@
public void setMaxConcurrentReplications(int number)
{
+ if (started)
+ {
+ log.warn("Cannot set attribute when service is started");
+ return;
+ }
this.maxConcurrentReplications = number;
}
+ public boolean isFailoverOnNodeLeave()
+ {
+ return failoverOnNodeLeave;
+ }
+
+ public void setFailoverOnNodeLeave(boolean failoverOnNodeLeave)
+ {
+ if (started)
+ {
+ log.warn("Cannot set attribute when service is started");
+ return;
+ }
+ this.failoverOnNodeLeave = failoverOnNodeLeave;
+ }
+
+
public String listBindings()
{
return postOffice.printBindingInformation();
@@ -417,7 +440,8 @@
jChannelFactory,
stateTimeout, castTimeout,
serverPeer.isSupportsFailover(),
- maxConcurrentReplications);
+ maxConcurrentReplications,
+ failoverOnNodeLeave);
}
else
{
More information about the jboss-cvs-commits
mailing list