[hibernate-commits] Hibernate SVN: r14255 - core/trunk/cache-jbosscache2/src/main/resources/org/hibernate/cache/jbc2/builder.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Fri Dec 21 14:51:44 EST 2007
Author: bstansberry at jboss.com
Date: 2007-12-21 14:51:44 -0500 (Fri, 21 Dec 2007)
New Revision: 14255
Modified:
core/trunk/cache-jbosscache2/src/main/resources/org/hibernate/cache/jbc2/builder/jgroups-stacks.xml
Log:
Add some properties that testsuite can set for faster test execution
Remove unsupported TCP_NIO configs
Modified: core/trunk/cache-jbosscache2/src/main/resources/org/hibernate/cache/jbc2/builder/jgroups-stacks.xml
===================================================================
--- core/trunk/cache-jbosscache2/src/main/resources/org/hibernate/cache/jbc2/builder/jgroups-stacks.xml 2007-12-21 19:49:29 UTC (rev 14254)
+++ core/trunk/cache-jbosscache2/src/main/resources/org/hibernate/cache/jbc2/builder/jgroups-stacks.xml 2007-12-21 19:51:44 UTC (rev 14255)
@@ -47,7 +47,7 @@
max_bundle_timeout="30"
use_incoming_packet_handler="true"
ip_ttl="${jgroups.udp.ip_ttl:2}"
- enable_bundling="true"
+ enable_bundling="${jgroup.udp.enable_bundling:true}"
use_concurrent_stack="true"
@@ -66,8 +66,8 @@
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"/>
+ <PING timeout="${jgroups.ping.timeout:2000}"
+ num_initial_members="${jgroups.ping.num_initial_members:3}"/>
<MERGE2 max_interval="100000"
min_interval="20000"/>
<FD_SOCK/>
@@ -115,7 +115,7 @@
max_bundle_timeout="30"
use_incoming_packet_handler="true"
ip_ttl="${jgroups.udp.ip_ttl:2}"
- enable_bundling="true"
+ enable_bundling="${jgroup.udp.enable_bundling:true}"
use_concurrent_stack="true"
@@ -133,9 +133,9 @@
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"/>
+ oob_thread_pool.rejection_policy="Run"/>
+ <PING timeout="${jgroups.ping.timeout:2000}"
+ num_initial_members="${jgroups.ping.num_initial_members:3}"/>
<MERGE2 max_interval="100000"
min_interval="20000"/>
<FD_SOCK/>
@@ -283,112 +283,6 @@
</config>
</stack>
-
- <stack name="tcp-nio"
- description="TCP based stack, with flow control and message bundling. This is usually used when IP
- multicasting cannot be used in a network, e.g. because it is disabled (routers discard multicast).
- 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]
- We currently require use_incoming_packet_handler=true (release 2.4 will support use_incoming_packet_handler=false
- due to threadless stack support).">
- <config>
- <TCP_NIO
- recv_buf_size="20000000"
- send_buf_size="640000"
- loopback="true"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- enable_bundling="true"
- start_port="7800"
- use_send_queues="false"
- sock_conn_timeout="300" skip_suspected_members="true"
- reader_threads="8"
- writer_threads="8"
- processor_threads="8"
- processor_minThreads="8"
- processor_maxThreads="8"
- processor_queueSize="100"
- processor_keepAliveTime="-1"/>
- <TCPPING timeout="3000"
- initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7800],localhost[7801]}"
- port_range="1"
- 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" />
- <pbcast.NAKACK
- use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="false"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
- join_retry_timeout="2000" shun="false"
- 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"/>
- </config>
- </stack>
-
-
- <stack name="tcp-nio-sync"
- description="TCP based stack, without flow control and without message bundling. This is usually used when IP
- multicasting cannot be used in a network, e.g. because it is disabled (routers discard multicast). This
- 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_NIO
- recv_buf_size="20000000"
- send_buf_size="640000"
- loopback="true"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- enable_bundling="true"
- start_port="7900"
- use_send_queues="false"
- sock_conn_timeout="300" skip_suspected_members="true"
- reader_threads="8"
- writer_threads="8"
- processor_threads="8"
- processor_minThreads="8"
- processor_maxThreads="8"
- processor_queueSize="100"
- processor_keepAliveTime="-1"/>
- <TCPPING timeout="3000"
- initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7900],localhost[7901]}"
- port_range="1"
- 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" />
- <pbcast.NAKACK
- use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="false"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
- join_retry_timeout="2000" shun="false"
- view_bundling="true"/>
- <pbcast.STREAMING_STATE_TRANSFER/>
- <!-- <pbcast.STATE_TRANSFER/> -->
- <pbcast.FLUSH timeout="0"/>
- </config>
- </stack>
-
-
<stack name="tunnel"
description="Used with a GossipRouter">
<config>
More information about the hibernate-commits
mailing list