Author: manik.surtani(a)jboss.com
Date: 2007-10-01 08:26:52 -0400 (Mon, 01 Oct 2007)
New Revision: 4522
Modified:
core/trunk/src/examples/resources/META-INF/replSync-service.xml
core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml
core/trunk/src/main/resources/META-INF/buddyreplication-service.xml
core/trunk/src/main/resources/META-INF/hibernate-recommended-config.xml
core/trunk/src/main/resources/META-INF/jdbcCacheLoader-service.xml
core/trunk/src/main/resources/META-INF/mixedPolicy-eviction-service.xml
core/trunk/src/main/resources/META-INF/pojocache-passivation-service.xml
core/trunk/src/main/resources/META-INF/pojocache-passivation-service2.xml
core/trunk/src/main/resources/META-INF/policyPerRegion-eviction-service.xml
core/trunk/src/main/resources/META-INF/replAsync-service.xml
core/trunk/src/main/resources/META-INF/replSync-passivation-service.xml
core/trunk/src/main/resources/META-INF/replSync-service-test.xml
core/trunk/src/main/resources/META-INF/replSync-service.xml
core/trunk/src/main/resources/META-INF/tree-service.xml
core/trunk/src/test-scripts/resources/bench.xml
core/trunk/src/test/resources/META-INF/unit-test-cache-service.xml
Log:
Removed deprecated JGroups config elements
Modified: core/trunk/src/examples/resources/META-INF/replSync-service.xml
===================================================================
--- core/trunk/src/examples/resources/META-INF/replSync-service.xml 2007-10-01 12:25:58
UTC (rev 4521)
+++ core/trunk/src/examples/resources/META-INF/replSync-service.xml 2007-10-01 12:26:52
UTC (rev 4522)
@@ -117,10 +117,10 @@
<FD_SOCK/>
<FD timeout="10000" max_tries="5"
shun="true"/>
<VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK max_xmit_size="60000"
- use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
+ <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"/>
Modified: core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml
===================================================================
---
core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml 2007-10-01
12:25:58 UTC (rev 4521)
+++
core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml 2007-10-01
12:26:52 UTC (rev 4522)
@@ -90,8 +90,7 @@
<FD shun="true"/>
<FD_SOCK/>
<VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK gc_lag="50"
retransmit_timeout="600,1200,2400,4800"
- max_xmit_size="8192"/>
+ <pbcast.NAKACK gc_lag="50"
retransmit_timeout="600,1200,2400,4800" />
<UNICAST timeout="600,1200,2400",4800/>
<pbcast.STABLE desired_avg_gossip="400000"/>
<FC max_credits="2000000" min_threshold="0.10"/>
Modified: core/trunk/src/main/resources/META-INF/buddyreplication-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/buddyreplication-service.xml 2007-10-01
12:25:58 UTC (rev 4521)
+++ core/trunk/src/main/resources/META-INF/buddyreplication-service.xml 2007-10-01
12:26:52 UTC (rev 4522)
@@ -106,10 +106,10 @@
<FD_SOCK/>
<FD timeout="10000" max_tries="5"
shun="true"/>
<VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK max_xmit_size="60000"
- use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
+ <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"/>
Modified: core/trunk/src/main/resources/META-INF/hibernate-recommended-config.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/hibernate-recommended-config.xml 2007-10-01
12:25:58 UTC (rev 4521)
+++ core/trunk/src/main/resources/META-INF/hibernate-recommended-config.xml 2007-10-01
12:26:52 UTC (rev 4522)
@@ -104,8 +104,7 @@
<!-- <FD shun="true"/>-->
<FD_SOCK/>
<VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK gc_lag="50"
retransmit_timeout="600,1200,2400,4800"
- max_xmit_size="8192"/>
+ <pbcast.NAKACK gc_lag="50"
retransmit_timeout="600,1200,2400,4800"/>
<UNICAST timeout="600,1200,2400"/>
<pbcast.STABLE desired_avg_gossip="20000"/>
<FRAG frag_size="8192"/>
Modified: core/trunk/src/main/resources/META-INF/jdbcCacheLoader-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/jdbcCacheLoader-service.xml 2007-10-01 12:25:58
UTC (rev 4521)
+++ core/trunk/src/main/resources/META-INF/jdbcCacheLoader-service.xml 2007-10-01 12:26:52
UTC (rev 4522)
@@ -86,23 +86,17 @@
mcast_send_buf_size="80000"
mcast_recv_buf_size="150000"
ucast_send_buf_size="80000"
ucast_recv_buf_size="150000"
loopback="false"/>
- <PING timeout="2000" num_initial_members="3"
- up_thread="false" down_thread="false"/>
+ <PING timeout="2000" num_initial_members="3"/>
<MERGE2 min_interval="10000"
max_interval="20000"/>
- <FD shun="true" up_thread="true"
down_thread="true"/>
- <VERIFY_SUSPECT timeout="1500"
- up_thread="false"
down_thread="false"/>
- <pbcast.NAKACK gc_lag="50"
retransmit_timeout="600,1200,2400,4800"
- max_xmit_size="8192" up_thread="false"
down_thread="false"/>
- <UNICAST timeout="600,1200,2400" window_size="100"
min_threshold="10"
- down_thread="false"/>
- <pbcast.STABLE desired_avg_gossip="20000"
- up_thread="false"
down_thread="false"/>
- <FRAG frag_size="8192"
- down_thread="false" up_thread="false"/>
+ <FD shun="true"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK gc_lag="50"
retransmit_timeout="600,1200,2400,4800"/>
+ <UNICAST timeout="600,1200,2400" window_size="100"
min_threshold="10"/>
+ <pbcast.STABLE desired_avg_gossip="20000"/>
+ <FRAG frag_size="8192"/>
<pbcast.GMS join_timeout="5000"
join_retry_timeout="2000"
shun="true" print_local_addr="true"/>
- <pbcast.STATE_TRANSFER up_thread="false"
down_thread="false"/>
+ <pbcast.STATE_TRANSFER/>
</config>
</attribute>
Modified: core/trunk/src/main/resources/META-INF/mixedPolicy-eviction-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/mixedPolicy-eviction-service.xml 2007-10-01
12:25:58 UTC (rev 4521)
+++ core/trunk/src/main/resources/META-INF/mixedPolicy-eviction-service.xml 2007-10-01
12:26:52 UTC (rev 4522)
@@ -101,10 +101,10 @@
<FD_SOCK/>
<FD timeout="10000" max_tries="5"
shun="true"/>
<VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK max_xmit_size="60000"
- use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
+ <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"/>
Modified: core/trunk/src/main/resources/META-INF/pojocache-passivation-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/pojocache-passivation-service.xml 2007-10-01
12:25:58 UTC (rev 4521)
+++ core/trunk/src/main/resources/META-INF/pojocache-passivation-service.xml 2007-10-01
12:26:52 UTC (rev 4522)
@@ -101,8 +101,7 @@
<FD_SOCK/>
<FD timeout="10000" max_tries="5"
shun="true"/>
<VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK max_xmit_size="60000"
- use_mcast_xmit="false" gc_lag="0"
+ <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"/>
Modified: core/trunk/src/main/resources/META-INF/pojocache-passivation-service2.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/pojocache-passivation-service2.xml 2007-10-01
12:25:58 UTC (rev 4521)
+++ core/trunk/src/main/resources/META-INF/pojocache-passivation-service2.xml 2007-10-01
12:26:52 UTC (rev 4522)
@@ -101,8 +101,7 @@
<FD_SOCK/>
<FD timeout="10000" max_tries="5"
shun="true"/>
<VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK max_xmit_size="60000"
- use_mcast_xmit="false" gc_lag="0"
+ <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"/>
Modified: core/trunk/src/main/resources/META-INF/policyPerRegion-eviction-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/policyPerRegion-eviction-service.xml 2007-10-01
12:25:58 UTC (rev 4521)
+++ core/trunk/src/main/resources/META-INF/policyPerRegion-eviction-service.xml 2007-10-01
12:26:52 UTC (rev 4522)
@@ -101,8 +101,7 @@
<FD_SOCK/>
<FD timeout="10000" max_tries="5"
shun="true"/>
<VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK max_xmit_size="60000"
- use_mcast_xmit="false" gc_lag="0"
+ <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"/>
Modified: core/trunk/src/main/resources/META-INF/replAsync-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/replAsync-service.xml 2007-10-01 12:25:58 UTC
(rev 4521)
+++ core/trunk/src/main/resources/META-INF/replAsync-service.xml 2007-10-01 12:26:52 UTC
(rev 4522)
@@ -117,8 +117,7 @@
<FD_SOCK/>
<FD timeout="10000" max_tries="5"
shun="true"/>
<VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK max_xmit_size="60000"
- use_mcast_xmit="false" gc_lag="0"
+ <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"/>
Modified: core/trunk/src/main/resources/META-INF/replSync-passivation-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/replSync-passivation-service.xml 2007-10-01
12:25:58 UTC (rev 4521)
+++ core/trunk/src/main/resources/META-INF/replSync-passivation-service.xml 2007-10-01
12:26:52 UTC (rev 4522)
@@ -101,8 +101,7 @@
<FD_SOCK/>
<FD timeout="10000" max_tries="5"
shun="true"/>
<VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK max_xmit_size="60000"
- use_mcast_xmit="false" gc_lag="0"
+ <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"/>
Modified: core/trunk/src/main/resources/META-INF/replSync-service-test.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/replSync-service-test.xml 2007-10-01 12:25:58
UTC (rev 4521)
+++ core/trunk/src/main/resources/META-INF/replSync-service-test.xml 2007-10-01 12:26:52
UTC (rev 4522)
@@ -117,8 +117,7 @@
<FD_SOCK/>
<FD timeout="10000" max_tries="5"
shun="true"/>
<VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK max_xmit_size="60000"
- use_mcast_xmit="false" gc_lag="0"
+ <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"/>
Modified: core/trunk/src/main/resources/META-INF/replSync-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/replSync-service.xml 2007-10-01 12:25:58 UTC
(rev 4521)
+++ core/trunk/src/main/resources/META-INF/replSync-service.xml 2007-10-01 12:26:52 UTC
(rev 4522)
@@ -117,8 +117,7 @@
<FD_SOCK/>
<FD timeout="10000" max_tries="5"
shun="true"/>
<VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK max_xmit_size="60000"
- use_mcast_xmit="false" gc_lag="0"
+ <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"/>
Modified: core/trunk/src/main/resources/META-INF/tree-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/tree-service.xml 2007-10-01 12:25:58 UTC (rev
4521)
+++ core/trunk/src/main/resources/META-INF/tree-service.xml 2007-10-01 12:26:52 UTC (rev
4522)
@@ -99,23 +99,17 @@
mcast_send_buf_size="80000"
mcast_recv_buf_size="150000"
ucast_send_buf_size="80000"
ucast_recv_buf_size="150000"
loopback="false"/>
- <PING timeout="2000" num_initial_members="3"
- up_thread="false" down_thread="false"/>
+ <PING timeout="2000" num_initial_members="3"/>
<MERGE2 min_interval="10000"
max_interval="20000"/>
- <FD shun="true" up_thread="true"
down_thread="true"/>
- <VERIFY_SUSPECT timeout="1500"
- up_thread="false"
down_thread="false"/>
- <pbcast.NAKACK gc_lag="50"
retransmit_timeout="600,1200,2400,4800"
- max_xmit_size="8192" up_thread="false"
down_thread="false"/>
- <UNICAST timeout="600,1200,2400" window_size="100"
min_threshold="10"
- down_thread="false"/>
- <pbcast.STABLE desired_avg_gossip="20000"
- up_thread="false"
down_thread="false"/>
- <FRAG frag_size="8192"
- down_thread="false" up_thread="false"/>
+ <FD shun="true"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK gc_lag="50"
retransmit_timeout="600,1200,2400,4800"/>
+ <UNICAST timeout="600,1200,2400" window_size="100"
min_threshold="10"/>
+ <pbcast.STABLE desired_avg_gossip="20000"/>
+ <FRAG frag_size="8192"/>
<pbcast.GMS join_timeout="5000"
join_retry_timeout="2000"
shun="true" print_local_addr="true"/>
- <pbcast.STATE_TRANSFER up_thread="false"
down_thread="false"/>
+ <pbcast.STATE_TRANSFER/>
</config>
</attribute>
Modified: core/trunk/src/test/resources/META-INF/unit-test-cache-service.xml
===================================================================
--- core/trunk/src/test/resources/META-INF/unit-test-cache-service.xml 2007-10-01 12:25:58
UTC (rev 4521)
+++ core/trunk/src/test/resources/META-INF/unit-test-cache-service.xml 2007-10-01 12:26:52
UTC (rev 4522)
@@ -207,8 +207,7 @@
<!-- this is a more typical configuration of FD and VERIFY_SUSPECT-->
<!--<FD timeout="10000" max_tries="5"
shun="true"/>-->
<!--<VERIFY_SUSPECT timeout="1500"/>-->
- <pbcast.NAKACK max_xmit_size="60000"
- use_mcast_xmit="false" gc_lag="0"
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
retransmit_timeout="300,600"
discard_delivered_msgs="true"/>
<UNICAST timeout="300,600"/>
@@ -280,8 +279,7 @@
<!-- this is a more typical configuration of FD and VERIFY_SUSPECT-->
<!--<FD timeout="10000" max_tries="5"
shun="true"/>-->
<!--<VERIFY_SUSPECT timeout="1500"/>-->
- <pbcast.NAKACK max_xmit_size="60000"
- use_mcast_xmit="false" gc_lag="0"
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
retransmit_timeout="300,600,900,1200"
discard_delivered_msgs="true"/>
<UNICAST timeout="300,600,900,1200"/>
@@ -304,65 +302,64 @@
Note that TCP.bind_addr and TCPPING.initial_hosts should be set, possibly
via system properties, e.g.
-Djgroups.bind_addr=192.168.5.2 and
-Djgroups.tcpping.initial_hosts=192.168.5.2[7800]">
<config>
- <TCP start_port="7800"
- 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="true"
- 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="25"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false"
- thread_pool.queue_max_size="100"
- 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"/>
-
- <TCPPING timeout="3000"
- initial_hosts="127.0.0.1[7800],127.0.0.1[7801]"
- port_range="1"
- num_initial_members="3"/>
- <MERGE2 max_interval="100000"
- min_interval="20000"/>
- <FD_SOCK/>
- <!--
+ <TCP start_port="7800"
+ 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="true"
+ 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="25"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="false"
+ thread_pool.queue_max_size="100"
+ 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"/>
+
+ <TCPPING timeout="3000"
+ initial_hosts="127.0.0.1[7800],127.0.0.1[7801]"
+ port_range="1"
+ num_initial_members="3"/>
+ <MERGE2 max_interval="100000"
+ min_interval="20000"/>
+ <FD_SOCK/>
+ <!--
Note that this is an atypically short timeout and a small number of
retries
configured this way to speed up unit testing, since we know all nodes run
in the same JVM
and hence failure detections will be very quick.
-->
- <FD timeout="1000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500" />
- <BARRIER />
- <pbcast.NAKACK max_xmit_size="60000"
- use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <pbcast.STABLE stability_delay="1000"
desired_avg_gossip="50000"
- max_bytes="400000"/>
- <VIEW_SYNC avg_send_interval="60000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
- join_retry_timeout="2000" shun="true"
- view_bundling="true"/>
- <FC max_credits="2000000"
- min_threshold="0.10"/>
- <FRAG2 frag_size="60000" />
+ <FD timeout="1000" max_tries="5"
shun="true"/>
+ <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"/>
+ <pbcast.STABLE stability_delay="1000"
desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <VIEW_SYNC avg_send_interval="60000"/>
+ <pbcast.GMS print_local_addr="true"
join_timeout="3000"
+ join_retry_timeout="2000" shun="true"
+ view_bundling="true"/>
+ <FC max_credits="2000000"
+ min_threshold="0.10"/>
+ <FRAG2 frag_size="60000"/>
<pbcast.STREAMING_STATE_TRANSFER/>
<!-- <pbcast.STATE_TRANSFER/> -->
<pbcast.FLUSH timeout="0"/>
@@ -376,65 +373,64 @@
configuration should be used instead of tcp when (1) synchronous calls are
used and (2) the message volume
(rate and size) is not that large">
<config>
- <TCP start_port="7800"
- 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="true"
- 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="25"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false"
- thread_pool.queue_max_size="100"
- 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"/>
-
- <TCPPING timeout="3000"
- initial_hosts="127.0.0.1[7800],127.0.0.1[7801]"
- port_range="1"
- num_initial_members="3"/>
- <MERGE2 max_interval="100000"
- min_interval="20000"/>
- <FD_SOCK/>
- <!--
+ <TCP start_port="7800"
+ 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="true"
+ 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="25"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="false"
+ thread_pool.queue_max_size="100"
+ 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"/>
+
+ <TCPPING timeout="3000"
+ initial_hosts="127.0.0.1[7800],127.0.0.1[7801]"
+ port_range="1"
+ num_initial_members="3"/>
+ <MERGE2 max_interval="100000"
+ min_interval="20000"/>
+ <FD_SOCK/>
+ <!--
Note that this is an atypically short timeout and a small number of
retries
configured this way to speed up unit testing, since we know all nodes run
in the same JVM
and hence failure detections will be very quick.
-->
- <FD timeout="1000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500" />
- <BARRIER />
- <pbcast.NAKACK max_xmit_size="60000"
- use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <pbcast.STABLE stability_delay="1000"
desired_avg_gossip="50000"
- max_bytes="400000"/>
- <VIEW_SYNC avg_send_interval="60000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
- join_retry_timeout="2000" shun="true"
- view_bundling="true"/>
- <FC max_credits="2000000"
- min_threshold="0.10"/>
- <FRAG2 frag_size="60000" />
+ <FD timeout="1000" max_tries="5"
shun="true"/>
+ <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"/>
+ <pbcast.STABLE stability_delay="1000"
desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <VIEW_SYNC avg_send_interval="60000"/>
+ <pbcast.GMS print_local_addr="true"
join_timeout="3000"
+ join_retry_timeout="2000" shun="true"
+ view_bundling="true"/>
+ <FC max_credits="2000000"
+ min_threshold="0.10"/>
+ <FRAG2 frag_size="60000"/>
<pbcast.STREAMING_STATE_TRANSFER/>
<!-- <pbcast.STATE_TRANSFER/> -->
<pbcast.FLUSH timeout="0"/>
Modified: core/trunk/src/test-scripts/resources/bench.xml
===================================================================
--- core/trunk/src/test-scripts/resources/bench.xml 2007-10-01 12:25:58 UTC (rev 4521)
+++ core/trunk/src/test-scripts/resources/bench.xml 2007-10-01 12:26:52 UTC (rev 4522)
@@ -19,7 +19,8 @@
<depends>jboss:service=TransactionManager</depends>
<!-- Configure the TransactionManager -->
- <attribute
name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup</attribute>
+ <attribute
name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
+ </attribute>
<!--
Isolation level : SERIALIZABLE
@@ -62,76 +63,28 @@
use_incoming_packet_handler="true"
use_outgoing_packet_handler="false"
ip_ttl="2"
- down_thread="false" up_thread="false"
enable_bundling="true"/>
- <PING timeout="2000"
- down_thread="false" up_thread="false"
num_initial_members="3"/>
- <!-- 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"/-->
- <pbcast.NAKACK max_xmit_size="60000"
- use_mcast_xmit="false" gc_lag="2"
- retransmit_timeout="100,200,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"/>
+ <PING timeout="2000" num_initial_members="3"/>
+ <!-- MERGE2 max_interval="100000"
min_interval="20000"/ -->
+ <FD_SOCK/>
+ <!--VERIFY_SUSPECT timeout="1500"/-->
+ <pbcast.NAKACK
+ use_mcast_xmit="false" gc_lag="2"
+ retransmit_timeout="100,200,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"
- 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="true"/>
<!-- Comment it out when we use repl_sync. We don't need fc when it is
sync mode. -->
- <!--FC max_credits="2000000" down_thread="false"
up_thread="false"
+ <!--FC max_credits="2000000"
min_threshold="0.20" max_block_time="5000"/-->
- <FRAG2 frag_size="60000" down_thread="false"
up_thread="false"/>
+ <FRAG2 frag_size="60000"/>
<!--Turn COMPRESS on when running PojoCache-->
<!--COMPRESS min_size="4000"
compression_level="1"/-->
- <pbcast.STATE_TRANSFER up_thread="false"
down_thread="false"/>
+ <pbcast.STATE_TRANSFER/>
</config>
-
- <!-- tcp-fast.xml | You have to edit bind_addr correctly. -->
- <!--
- <config>
- <TCP bind_addr="192.168.160.101"
- recv_buf_size="20000000"
- 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"
- down_thread="false" up_thread="false"
- enable_bundling="true"
- start_port="7800"
- use_send_queues="false"
- sock_conn_timeout="300"
skip_suspected_members="true"/>
- <MPING timeout="2000"
- num_initial_members="2"
- mcast_addr="${jboss.partition.udpGroup:230.1.2.7}"
- bind_addr="192.168.160.101"
- down_thread="false" up_thread="false"/>
- <FD_SOCK down_thread="false" up_thread="false"/>
- <pbcast.NAKACK max_xmit_size="60000"
- use_mcast_xmit="false" gc_lag="10"
-
retransmit_timeout="100,200,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"/>
- <VIEW_SYNC avg_send_interval="60000"
down_thread="false" up_thread="false" />
- <pbcast.GMS print_local_addr="true"
join_timeout="3000"
- down_thread="false" up_thread="false"
- join_retry_timeout="2000" shun="true"/>
- <FC max_credits="2000000" down_thread="false"
up_thread="false"
- min_threshold="0.10" max_block_time="1000"/>
- <pbcast.STATE_TRANSFER up_thread="false"
down_thread="false"/>
- </config>
- -->
</attribute>
<!-- Max number of milliseconds to wait for a lock acquisition -->