[jbosscache-commits] JBoss Cache SVN: r5192 - core/trunk/src/main/resources/META-INF.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Tue Jan 22 12:56:08 EST 2008
Author: mircea.markus
Date: 2008-01-22 12:56:08 -0500 (Tue, 22 Jan 2008)
New Revision: 5192
Modified:
core/trunk/src/main/resources/META-INF/buddyreplication-service.xml
core/trunk/src/main/resources/META-INF/clonable-config-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/local-elementsize-eviction-service.xml
core/trunk/src/main/resources/META-INF/local-eviction-cacheloader-service.xml
core/trunk/src/main/resources/META-INF/local-expiration-eviction-service.xml
core/trunk/src/main/resources/META-INF/local-fifo-eviction-service.xml
core/trunk/src/main/resources/META-INF/local-lfu-eviction-service.xml
core/trunk/src/main/resources/META-INF/local-lru-eviction-service.xml
core/trunk/src/main/resources/META-INF/local-mru-eviction-service.xml
core/trunk/src/main/resources/META-INF/local-null-eviction-service.xml
core/trunk/src/main/resources/META-INF/local-passivation-service.xml
core/trunk/src/main/resources/META-INF/local-service.xml
core/trunk/src/main/resources/META-INF/local-tx-service.xml
core/trunk/src/main/resources/META-INF/mixedPolicy-eviction-service.xml
core/trunk/src/main/resources/META-INF/mux-service.xml
core/trunk/src/main/resources/META-INF/optimistic-eviction.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
Log:
http://jira.jboss.com/jira/browse/JBCACHE-1269
Modified: core/trunk/src/main/resources/META-INF/buddyreplication-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/buddyreplication-service.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/buddyreplication-service.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -65,20 +65,14 @@
-->
<attribute name="ClusterConfig">
<config>
- <UDP mcast_addr="228.10.10.10"
- mcast_port="45588"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
+ <TCP recv_buf_size="20000000" use_send_queues="false"
loopback="false"
discard_incompatible_packets="true"
max_bundle_size="64000"
max_bundle_timeout="30"
use_incoming_packet_handler="true"
- ip_ttl="2"
- enable_bundling="false"
+ enable_bundling="true"
+ enable_unicast_bundling="true"
enable_diagnostics="true"
use_concurrent_stack="true"
@@ -87,34 +81,37 @@
thread_pool.enabled="true"
thread_pool.min_threads="1"
- thread_pool.max_threads="25"
+ thread_pool.max_threads="4"
thread_pool.keep_alive_time="30000"
thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="10"
- thread_pool.rejection_policy="Run"
+ thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard"
oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
+ oob_thread_pool.min_threads="2"
oob_thread_pool.max_threads="4"
oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.queue_enabled="true"
+ oob_thread_pool.queue_enabled="false"
oob_thread_pool.queue_max_size="10"
oob_thread_pool.rejection_policy="Run"/>
- <PING timeout="2000" num_initial_members="3"/>
+ <!--<PING timeout="2000" num_initial_members="3"/>-->
+ <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
<MERGE2 max_interval="30000" min_interval="10000"/>
<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="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"/>
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <!--<UNICAST timeout="30,60,120,300,600,1200,2400,3600"/>-->
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false"
+ <pbcast.GMS print_local_addr="true" join_timeout="5000"
+ join_retry_timeout="2000" shun="false"
view_bundling="true" view_ack_collection_timeout="5000"/>
+ <FC max_credits="5000000"
+ min_threshold="0.20"/>
<FRAG2 frag_size="60000"/>
<pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
<!-- <pbcast.STATE_TRANSFER/> -->
@@ -123,6 +120,7 @@
</attribute>
+
<!--
The max amount of time (in milliseconds) we wait until the
state (ie. the contents of the cache) are retrieved from
Modified: core/trunk/src/main/resources/META-INF/clonable-config-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/clonable-config-service.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/clonable-config-service.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -26,59 +26,48 @@
<attribute name="MultiplexerStack">udp</attribute>
<attribute name="ClusterConfig">
<config>
- <UDP mcast_addr="228.10.10.10"
- mcast_port="45588"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
+ <TCP recv_buf_size="20000000" use_send_queues="false"
loopback="false"
discard_incompatible_packets="true"
max_bundle_size="64000"
max_bundle_timeout="30"
use_incoming_packet_handler="true"
- ip_ttl="2"
- enable_bundling="false"
+ enable_bundling="true"
+ enable_unicast_bundling="true"
enable_diagnostics="true"
-
use_concurrent_stack="true"
-
thread_naming_pattern="pl"
-
thread_pool.enabled="true"
thread_pool.min_threads="1"
- thread_pool.max_threads="25"
+ thread_pool.max_threads="4"
thread_pool.keep_alive_time="30000"
thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="10"
- thread_pool.rejection_policy="Run"
-
+ thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard"
oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
+ oob_thread_pool.min_threads="2"
oob_thread_pool.max_threads="4"
oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.queue_enabled="true"
+ oob_thread_pool.queue_enabled="false"
oob_thread_pool.queue_max_size="10"
oob_thread_pool.rejection_policy="Run"/>
-
- <PING timeout="2000" num_initial_members="3"/>
+ <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
<MERGE2 max_interval="30000" min_interval="10000"/>
<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="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"/>
+ <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"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false"
+ <pbcast.GMS print_local_addr="true" join_timeout="5000"
+ join_retry_timeout="2000" shun="false"
view_bundling="true" view_ack_collection_timeout="5000"/>
+ <FC max_credits="5000000"
+ min_threshold="0.20"/>
<FRAG2 frag_size="60000"/>
<pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <!-- <pbcast.STATE_TRANSFER/> -->
<pbcast.FLUSH timeout="0"/>
</config>
</attribute>
Modified: core/trunk/src/main/resources/META-INF/hibernate-recommended-config.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/hibernate-recommended-config.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/hibernate-recommended-config.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -87,33 +87,64 @@
<!-- JGroups protocol stack properties.
ClusterConfig isn't used if the multiplexer is enabled and successfully initialized.
-->
+
<attribute name="ClusterConfig">
<config>
- <!-- UDP: if you have a multihomed machine,
- set the bind_addr attribute to the appropriate NIC IP address -->
- <!-- UDP: On Windows machines, because of the media sense feature
- being broken with multicast (even after disabling media sense)
- set the loopback attribute to true -->
- <UDP mcast_addr="228.1.2.3" mcast_port="48866"
- ip_ttl="64" ip_mcast="true"
- mcast_send_buf_size="150000" mcast_recv_buf_size="80000"
- ucast_send_buf_size="150000" ucast_recv_buf_size="80000"
- loopback="false"/>
- <PING timeout="2000" num_initial_members="3"/>
- <MERGE2 min_interval="10000" max_interval="20000"/>
- <!-- <FD shun="true"/>-->
+ <TCP recv_buf_size="20000000" use_send_queues="false"
+ loopback="false"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ enable_bundling="true"
+ enable_unicast_bundling="true"
+ enable_diagnostics="true"
+
+ use_concurrent_stack="true"
+
+ thread_naming_pattern="pl"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="4"
+ thread_pool.keep_alive_time="30000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="2"
+ oob_thread_pool.max_threads="4"
+ oob_thread_pool.keep_alive_time="10000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run"/>
+
+ <!--<PING timeout="2000" num_initial_members="3"/>-->
+ <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
<FD_SOCK/>
+ <FD timeout="10000" max_tries="5" shun="true"/>
<VERIFY_SUSPECT timeout="1500"/>
- <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"/>
- <pbcast.GMS join_timeout="5000"
- shun="true" print_local_addr="true"/>
- <pbcast.STATE_TRANSFER/>
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <!--<UNICAST timeout="30,60,120,300,600,1200,2400,3600"/>-->
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="5000"
+ join_retry_timeout="2000" shun="false"
+ view_bundling="true" view_ack_collection_timeout="5000"/>
+ <FC max_credits="5000000"
+ min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <!-- <pbcast.STATE_TRANSFER/> -->
+ <pbcast.FLUSH timeout="0"/>
</config>
</attribute>
+
<!--
Whether or not to fetch state on joining a cluster
NOTE this used to be called FetchStateOnStartup and has been renamed to be more descriptive.
Modified: core/trunk/src/main/resources/META-INF/jdbcCacheLoader-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/jdbcCacheLoader-service.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/jdbcCacheLoader-service.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -76,31 +76,62 @@
<attribute name="ClusterConfig">
<config>
- <!-- UDP: if you have a multihomed machine,
- set the bind_addr attribute to the appropriate NIC IP address -->
- <!-- UDP: On Windows machines, because of the media sense feature
- being broken with multicast (even after disabling media sense)
- set the loopback attribute to true -->
- <UDP mcast_addr="230.8.8.8" mcast_port="56677"
- ip_ttl="32" ip_mcast="true"
- 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"/>
- <MERGE2 min_interval="10000" max_interval="20000"/>
- <FD shun="true"/>
+ <TCP recv_buf_size="20000000" use_send_queues="false"
+ loopback="false"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ enable_bundling="true"
+ enable_unicast_bundling="true"
+ enable_diagnostics="true"
+
+ use_concurrent_stack="true"
+
+ thread_naming_pattern="pl"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="4"
+ thread_pool.keep_alive_time="30000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="2"
+ oob_thread_pool.max_threads="4"
+ oob_thread_pool.keep_alive_time="10000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run"/>
+
+ <!--<PING timeout="2000" num_initial_members="3"/>-->
+ <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD timeout="10000" max_tries="5" 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"
- shun="true" print_local_addr="true"/>
- <pbcast.STATE_TRANSFER/>
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <!--<UNICAST timeout="30,60,120,300,600,1200,2400,3600"/>-->
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="5000"
+ join_retry_timeout="2000" shun="false"
+ view_bundling="true" view_ack_collection_timeout="5000"/>
+ <FC max_credits="5000000"
+ min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <!-- <pbcast.STATE_TRANSFER/> -->
+ <pbcast.FLUSH timeout="0"/>
</config>
</attribute>
+
<!--
The max amount of time (in milliseconds) we wait until the
state (ie. the contents of the cache) are retrieved from
Modified: core/trunk/src/main/resources/META-INF/local-elementsize-eviction-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/local-elementsize-eviction-service.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/local-elementsize-eviction-service.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -41,35 +41,6 @@
-->
<attribute name="CacheMode">LOCAL</attribute>
- <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
- cluster in order to find each other.
- -->
- <attribute name="ClusterName">JBossCache-Cluster</attribute>
-
- <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS. -->
- <!--
- <depends>jgroups.mux:name=Multiplexer</depends>
- <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
- <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
- -->
-
- <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is LOCAL -->
-
- <!--
- The max amount of time (in milliseconds) we wait until the
- state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
- <attribute name="StateRetrievalTimeout">20000</attribute>
-
- <!--
- Number of milliseconds to wait until all responses for a
- synchronous call have been received.
- -->
- <attribute name="SyncReplTimeout">20000</attribute>
-
<!-- Max number of milliseconds to wait for a lock acquisition -->
<attribute name="LockAcquisitionTimeout">15000</attribute>
Modified: core/trunk/src/main/resources/META-INF/local-eviction-cacheloader-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/local-eviction-cacheloader-service.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/local-eviction-cacheloader-service.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -41,26 +41,6 @@
-->
<attribute name="CacheMode">LOCAL</attribute>
- <!-- Name of cluster. Needs to be the same for all clusters, in order
- to find each other
- -->
- <attribute name="ClusterName">JBossCache-Cluster</attribute>
-
- <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is LOCAL -->
-
- <!--
- The max amount of time (in milliseconds) we wait until the
- state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
- <attribute name="StateRetrievalTimeout">20000</attribute>
-
- <!--
- Number of milliseconds to wait until all responses for a
- synchronous call have been received.
- -->
- <attribute name="SyncReplTimeout">20000</attribute>
-
<!-- Max number of milliseconds to wait for a lock acquisition -->
<attribute name="LockAcquisitionTimeout">15000</attribute>
Modified: core/trunk/src/main/resources/META-INF/local-expiration-eviction-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/local-expiration-eviction-service.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/local-expiration-eviction-service.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -41,35 +41,6 @@
-->
<attribute name="CacheMode">LOCAL</attribute>
- <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
- cluster in order to find each other.
- -->
- <attribute name="ClusterName">JBossCache-Cluster</attribute>
-
- <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS. -->
- <!--
- <depends>jgroups.mux:name=Multiplexer</depends>
- <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
- <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
- -->
-
- <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is LOCAL -->
-
- <!--
- The max amount of time (in milliseconds) we wait until the
- state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
- <attribute name="StateRetrievalTimeout">20000</attribute>
-
- <!--
- Number of milliseconds to wait until all responses for a
- synchronous call have been received.
- -->
- <attribute name="SyncReplTimeout">20000</attribute>
-
<!-- Max number of milliseconds to wait for a lock acquisition -->
<attribute name="LockAcquisitionTimeout">15000</attribute>
Modified: core/trunk/src/main/resources/META-INF/local-fifo-eviction-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/local-fifo-eviction-service.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/local-fifo-eviction-service.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -41,39 +41,9 @@
-->
<attribute name="CacheMode">LOCAL</attribute>
- <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
- cluster in order to find each other.
- -->
- <attribute name="ClusterName">JBossCache-Cluster</attribute>
-
- <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS. -->
- <!--
- <depends>jgroups.mux:name=Multiplexer</depends>
- <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
- <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
- -->
-
- <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is LOCAL -->
-
- <!--
- The max amount of time (in milliseconds) we wait until the
- state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
- <attribute name="StateRetrievalTimeout">20000</attribute>
-
- <!--
- Number of milliseconds to wait until all responses for a
- synchronous call have been received.
- -->
- <attribute name="SyncReplTimeout">20000</attribute>
-
<!-- Max number of milliseconds to wait for a lock acquisition -->
<attribute name="LockAcquisitionTimeout">15000</attribute>
-
<!-- Specific eviction policy configurations. This is LRU -->
<attribute name="EvictionPolicyConfig">
<config>
Modified: core/trunk/src/main/resources/META-INF/local-lfu-eviction-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/local-lfu-eviction-service.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/local-lfu-eviction-service.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -41,37 +41,6 @@
-->
<attribute name="CacheMode">LOCAL</attribute>
- <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
- cluster in order to find each other.
- -->
- <attribute name="ClusterName">JBossCache-Cluster</attribute>
-
- <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS. -->
- <!--
- <depends>jgroups.mux:name=Multiplexer</depends>
- <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
- <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
- -->
-
-
- <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is LOCAL -->
-
-
- <!--
- The max amount of time (in milliseconds) we wait until the
- state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
- <attribute name="StateRetrievalTimeout">20000</attribute>
-
- <!--
- Number of milliseconds to wait until all responses for a
- synchronous call have been received.
- -->
- <attribute name="SyncReplTimeout">20000</attribute>
-
<!-- Max number of milliseconds to wait for a lock acquisition -->
<attribute name="LockAcquisitionTimeout">15000</attribute>
Modified: core/trunk/src/main/resources/META-INF/local-lru-eviction-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/local-lru-eviction-service.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/local-lru-eviction-service.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -43,36 +43,6 @@
-->
<attribute name="CacheMode">LOCAL</attribute>
- <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
- cluster in order to find each other.
- -->
- <attribute name="ClusterName">JBossCache-Cluster</attribute>
-
- <!--Uncomment next three statements to enable JGroups multiplexer.
- This configuration is dependent on the JGroups multiplexer being
- registered in an MBean server such as JBossAS. -->
- <!--
- <depends>jgroups.mux:name=Multiplexer</depends>
- <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
- <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
- -->
-
- <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is LOCAL -->
-
-
- <!--
- The max amount of time (in milliseconds) we wait until the
- state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
- <attribute name="StateRetrievalTimeout">20000</attribute>
-
- <!--
- Number of milliseconds to wait until all responses for a
- synchronous call have been received.
- -->
- <attribute name="SyncReplTimeout">20000</attribute>
-
<!-- Max number of milliseconds to wait for a lock acquisition -->
<attribute name="LockAcquisitionTimeout">15000</attribute>
Modified: core/trunk/src/main/resources/META-INF/local-mru-eviction-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/local-mru-eviction-service.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/local-mru-eviction-service.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -24,7 +24,6 @@
<attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
</attribute>
-
<!--
Node locking level : SERIALIZABLE
REPEATABLE_READ (default)
@@ -41,40 +40,9 @@
-->
<attribute name="CacheMode">LOCAL</attribute>
- <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
- cluster in order to find each other.
- -->
- <attribute name="ClusterName">JBossCache-Cluster</attribute>
-
- <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS. -->
- <!--
- <depends>jgroups.mux:name=Multiplexer</depends>
- <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
- <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
- -->
-
- <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is LOCAL -->
-
-
- <!--
- The max amount of time (in milliseconds) we wait until the
- state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
- <attribute name="StateRetrievalTimeout">20000</attribute>
-
- <!--
- Number of milliseconds to wait until all responses for a
- synchronous call have been received.
- -->
- <attribute name="SyncReplTimeout">20000</attribute>
-
<!-- Max number of milliseconds to wait for a lock acquisition -->
<attribute name="LockAcquisitionTimeout">15000</attribute>
-
<!-- Specific eviction policy configurations. This is LRU -->
<attribute name="EvictionPolicyConfig">
<config>
Modified: core/trunk/src/main/resources/META-INF/local-null-eviction-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/local-null-eviction-service.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/local-null-eviction-service.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -43,36 +43,6 @@
-->
<attribute name="CacheMode">LOCAL</attribute>
- <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
- cluster in order to find each other.
- -->
- <attribute name="ClusterName">JBossCache-Cluster</attribute>
-
- <!--Uncomment next three statements to enable JGroups multiplexer.
- This configuration is dependent on the JGroups multiplexer being
- registered in an MBean server such as JBossAS. -->
- <!--
- <depends>jgroups.mux:name=Multiplexer</depends>
- <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
- <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
- -->
-
- <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is LOCAL -->
-
-
- <!--
- The max amount of time (in milliseconds) we wait until the
- state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
- <attribute name="StateRetrievalTimeout">20000</attribute>
-
- <!--
- Number of milliseconds to wait until all responses for a
- synchronous call have been received.
- -->
- <attribute name="SyncReplTimeout">20000</attribute>
-
<!-- Max number of milliseconds to wait for a lock acquisition -->
<attribute name="LockAcquisitionTimeout">15000</attribute>
Modified: core/trunk/src/main/resources/META-INF/local-passivation-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/local-passivation-service.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/local-passivation-service.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -41,41 +41,9 @@
-->
<attribute name="CacheMode">LOCAL</attribute>
- <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
- cluster in order to find each other.
- -->
- <attribute name="ClusterName">JBossCache-Cluster</attribute>
-
- <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS. -->
- <!--
- <depends>jgroups.mux:name=Multiplexer</depends>
- <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
- <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
- -->
-
-
- <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is LOCAL -->
-
-
- <!--
- The max amount of time (in milliseconds) we wait until the
- state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
- <attribute name="StateRetrievalTimeout">20000</attribute>
-
- <!--
- Number of milliseconds to wait until all responses for a
- synchronous call have been received.
- -->
- <attribute name="SyncReplTimeout">20000</attribute>
-
<!-- Max number of milliseconds to wait for a lock acquisition -->
<attribute name="LockAcquisitionTimeout">15000</attribute>
-
<!-- Specific eviction policy configurations. This is LRU -->
<attribute name="EvictionPolicyConfig">
<config>
Modified: core/trunk/src/main/resources/META-INF/local-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/local-service.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/local-service.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -42,36 +42,6 @@
-->
<attribute name="CacheMode">LOCAL</attribute>
- <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
- cluster in order to find each other.
- -->
- <attribute name="ClusterName">JBossCache-Cluster</attribute>
-
- <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS. -->
- <!--
- <depends>jgroups.mux:name=Multiplexer</depends>
- <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
- <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
- -->
-
- <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is LOCAL -->
-
-
- <!--
- The max amount of time (in milliseconds) we wait until the
- state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
- <attribute name="StateRetrievalTimeout">20000</attribute>
-
- <!--
- Number of milliseconds to wait until all responses for a
- synchronous call have been received.
- -->
- <attribute name="SyncReplTimeout">20000</attribute>
-
<!-- Max number of milliseconds to wait for a lock acquisition -->
<attribute name="LockAcquisitionTimeout">15000</attribute>
Modified: core/trunk/src/main/resources/META-INF/local-tx-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/local-tx-service.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/local-tx-service.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -42,32 +42,6 @@
-->
<attribute name="CacheMode">LOCAL</attribute>
- <!-- Name of cluster. Needs to be the same for all clusters, in order
- to find each other
- -->
- <attribute name="ClusterName">JBossCache-Cluster</attribute>
-
- <!-- JGroups protocol stack properties. Can also be a URL,
- e.g. file:/home/bela/default.xml
- <attribute name="ClusterProperties"></attribute>
- -->
-
- <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is LOCAL -->
-
-
- <!--
- The max amount of time (in milliseconds) we wait until the
- state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
- <attribute name="StateRetrievalTimeout">20000</attribute>
-
- <!--
- Number of milliseconds to wait until all responses for a
- synchronous call have been received.
- -->
- <attribute name="SyncReplTimeout">20000</attribute>
-
<!-- Max number of milliseconds to wait for a lock acquisition -->
<attribute name="LockAcquisitionTimeout">15000</attribute>
Modified: core/trunk/src/main/resources/META-INF/mixedPolicy-eviction-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/mixedPolicy-eviction-service.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/mixedPolicy-eviction-service.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -41,101 +41,7 @@
-->
<attribute name="CacheMode">LOCAL</attribute>
- <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
- cluster in order to find each other.
- -->
- <attribute name="ClusterName">JBossCache-Cluster</attribute>
- <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS. -->
- <!--
- <depends>jgroups.mux:name=Multiplexer</depends>
- <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
- <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
- -->
-
- <!-- JGroups protocol stack properties.
- ClusterConfig isn't used if the multiplexer is enabled and successfully initialized.
- -->
- <attribute name="ClusterConfig">
- <config>
- <UDP mcast_addr="228.10.10.10"
- mcast_port="45588"
- 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="2"
- enable_bundling="false"
- enable_diagnostics="true"
-
- use_concurrent_stack="true"
-
- thread_naming_pattern="pl"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="25"
- thread_pool.keep_alive_time="30000"
- thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="10"
- thread_pool.rejection_policy="Run"
-
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="4"
- oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.queue_enabled="true"
- oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run"/>
-
- <PING timeout="2000" num_initial_members="3"/>
- <MERGE2 max_interval="30000" min_interval="10000"/>
- <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="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false"
- view_bundling="true" view_ack_collection_timeout="5000"/>
- <FC max_credits="20000000" min_threshold="0.10"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <!-- <pbcast.STATE_TRANSFER/> -->
- <pbcast.FLUSH timeout="0"/>
- </config>
- </attribute>
-
-
- <!--
- The max amount of time (in milliseconds) we wait until the
- state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
- <attribute name="StateRetrievalTimeout">20000</attribute>
-
- <!--
- Number of milliseconds to wait until all responses for a
- synchronous call have been received.
- -->
- <attribute name="SyncReplTimeout">20000</attribute>
-
- <!-- Max number of milliseconds to wait for a lock acquisition -->
- <attribute name="LockAcquisitionTimeout">15000</attribute>
-
-
<!-- Specific eviction policy configurations. This is LRU -->
<attribute name="EvictionPolicyConfig">
<config>
Modified: core/trunk/src/main/resources/META-INF/mux-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/mux-service.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/mux-service.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -48,19 +48,7 @@
-->
<attribute name="CacheMode">LOCAL</attribute>
- <!-- Name of cluster. Needs to be the same for all nodes in a clusters, in order
- to find each other.
- -->
- <attribute name="ClusterName">JBossCache-Cluster</attribute>
-
<!--
- The max amount of time (in milliseconds) we wait until the
- state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
- <attribute name="StateRetrievalTimeout">20000</attribute>
-
- <!--
Number of milliseconds to wait until all responses for a
synchronous call have been received.
-->
Modified: core/trunk/src/main/resources/META-INF/optimistic-eviction.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/optimistic-eviction.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/optimistic-eviction.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -54,11 +54,6 @@
-->
<attribute name="CacheMode">LOCAL</attribute>
- <!-- Name of cluster. Needs to be the same for all clusters, in order
- to find each other
- -->
- <attribute name="ClusterName">Infa-Cache-Cluster</attribute>
-
<!-- Max number of milliseconds to wait for a lock acquisition -->
<attribute name="LockAcquisitionTimeout">10000</attribute>
Modified: core/trunk/src/main/resources/META-INF/pojocache-passivation-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/pojocache-passivation-service.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/pojocache-passivation-service.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -58,22 +58,16 @@
<!-- JGroups protocol stack properties.
ClusterConfig isn't used if the multiplexer is enabled and successfully initialized.
-->
- <attribute name="ClusterConfig">
+<attribute name="ClusterConfig">
<config>
- <UDP mcast_addr="228.10.10.10"
- mcast_port="45588"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
+ <TCP recv_buf_size="20000000" use_send_queues="false"
loopback="false"
discard_incompatible_packets="true"
max_bundle_size="64000"
max_bundle_timeout="30"
use_incoming_packet_handler="true"
- ip_ttl="2"
- enable_bundling="false"
+ enable_bundling="true"
+ enable_unicast_bundling="true"
enable_diagnostics="true"
use_concurrent_stack="true"
@@ -82,21 +76,22 @@
thread_pool.enabled="true"
thread_pool.min_threads="1"
- thread_pool.max_threads="25"
+ thread_pool.max_threads="4"
thread_pool.keep_alive_time="30000"
thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="10"
- thread_pool.rejection_policy="Run"
+ thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard"
oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
+ oob_thread_pool.min_threads="2"
oob_thread_pool.max_threads="4"
oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.queue_enabled="true"
+ oob_thread_pool.queue_enabled="false"
oob_thread_pool.queue_max_size="10"
oob_thread_pool.rejection_policy="Run"/>
- <PING timeout="2000" num_initial_members="3"/>
+ <!--<PING timeout="2000" num_initial_members="3"/>-->
+ <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
<MERGE2 max_interval="30000" min_interval="10000"/>
<FD_SOCK/>
<FD timeout="10000" max_tries="5" shun="true"/>
@@ -104,12 +99,14 @@
<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"/>
+ <!--<UNICAST timeout="30,60,120,300,600,1200,2400,3600"/>-->
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false"
+ <pbcast.GMS print_local_addr="true" join_timeout="5000"
+ join_retry_timeout="2000" shun="false"
view_bundling="true" view_ack_collection_timeout="5000"/>
- <FC max_credits="20000000" min_threshold="0.10"/>
+ <FC max_credits="5000000"
+ min_threshold="0.20"/>
<FRAG2 frag_size="60000"/>
<pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
<!-- <pbcast.STATE_TRANSFER/> -->
@@ -117,7 +114,6 @@
</config>
</attribute>
-
<!--
The max amount of time (in milliseconds) we wait until the
state (ie. the contents of the cache) are retrieved from
Modified: core/trunk/src/main/resources/META-INF/pojocache-passivation-service2.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/pojocache-passivation-service2.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/pojocache-passivation-service2.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -60,20 +60,14 @@
-->
<attribute name="ClusterConfig">
<config>
- <UDP mcast_addr="228.10.10.10"
- mcast_port="45588"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
+ <TCP recv_buf_size="20000000" use_send_queues="false"
loopback="false"
discard_incompatible_packets="true"
max_bundle_size="64000"
max_bundle_timeout="30"
use_incoming_packet_handler="true"
- ip_ttl="2"
- enable_bundling="false"
+ enable_bundling="true"
+ enable_unicast_bundling="true"
enable_diagnostics="true"
use_concurrent_stack="true"
@@ -82,21 +76,22 @@
thread_pool.enabled="true"
thread_pool.min_threads="1"
- thread_pool.max_threads="25"
+ thread_pool.max_threads="4"
thread_pool.keep_alive_time="30000"
thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="10"
- thread_pool.rejection_policy="Run"
+ thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard"
oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
+ oob_thread_pool.min_threads="2"
oob_thread_pool.max_threads="4"
oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.queue_enabled="true"
+ oob_thread_pool.queue_enabled="false"
oob_thread_pool.queue_max_size="10"
oob_thread_pool.rejection_policy="Run"/>
- <PING timeout="2000" num_initial_members="3"/>
+ <!--<PING timeout="2000" num_initial_members="3"/>-->
+ <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
<MERGE2 max_interval="30000" min_interval="10000"/>
<FD_SOCK/>
<FD timeout="10000" max_tries="5" shun="true"/>
@@ -104,12 +99,14 @@
<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"/>
+ <!--<UNICAST timeout="30,60,120,300,600,1200,2400,3600"/>-->
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false"
+ <pbcast.GMS print_local_addr="true" join_timeout="5000"
+ join_retry_timeout="2000" shun="false"
view_bundling="true" view_ack_collection_timeout="5000"/>
- <FC max_credits="20000000" min_threshold="0.10"/>
+ <FC max_credits="5000000"
+ min_threshold="0.20"/>
<FRAG2 frag_size="60000"/>
<pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
<!-- <pbcast.STATE_TRANSFER/> -->
@@ -117,7 +114,6 @@
</config>
</attribute>
-
<!--
The max amount of time (in milliseconds) we wait until the
state (ie. the contents of the cache) are retrieved from
Modified: core/trunk/src/main/resources/META-INF/policyPerRegion-eviction-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/policyPerRegion-eviction-service.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/policyPerRegion-eviction-service.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -60,43 +60,33 @@
-->
<attribute name="ClusterConfig">
<config>
- <UDP mcast_addr="228.10.10.10"
- mcast_port="45588"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
+ <TCP recv_buf_size="20000000" use_send_queues="false"
loopback="false"
discard_incompatible_packets="true"
max_bundle_size="64000"
max_bundle_timeout="30"
use_incoming_packet_handler="true"
- ip_ttl="2"
- enable_bundling="false"
+ enable_bundling="true"
+ enable_unicast_bundling="true"
enable_diagnostics="true"
-
use_concurrent_stack="true"
-
thread_naming_pattern="pl"
-
thread_pool.enabled="true"
thread_pool.min_threads="1"
- thread_pool.max_threads="25"
+ thread_pool.max_threads="4"
thread_pool.keep_alive_time="30000"
thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="10"
- thread_pool.rejection_policy="Run"
-
+ thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard"
oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
+ oob_thread_pool.min_threads="2"
oob_thread_pool.max_threads="4"
oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.queue_enabled="true"
+ oob_thread_pool.queue_enabled="false"
oob_thread_pool.queue_max_size="10"
oob_thread_pool.rejection_policy="Run"/>
-
- <PING timeout="2000" num_initial_members="3"/>
+ <!--<PING timeout="2000" num_initial_members="3"/>-->
+ <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
<MERGE2 max_interval="30000" min_interval="10000"/>
<FD_SOCK/>
<FD timeout="10000" max_tries="5" shun="true"/>
@@ -104,12 +94,14 @@
<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"/>
+ <!--<UNICAST timeout="30,60,120,300,600,1200,2400,3600"/>-->
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false"
+ <pbcast.GMS print_local_addr="true" join_timeout="5000"
+ join_retry_timeout="2000" shun="false"
view_bundling="true" view_ack_collection_timeout="5000"/>
- <FC max_credits="20000000" min_threshold="0.10"/>
+ <FC max_credits="5000000"
+ min_threshold="0.20"/>
<FRAG2 frag_size="60000"/>
<pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
<!-- <pbcast.STATE_TRANSFER/> -->
Modified: core/trunk/src/main/resources/META-INF/replAsync-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/replAsync-service.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/replAsync-service.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -76,43 +76,33 @@
-->
<attribute name="ClusterConfig">
<config>
- <UDP mcast_addr="228.10.10.10"
- mcast_port="45588"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
+ <TCP recv_buf_size="20000000" use_send_queues="false"
loopback="false"
discard_incompatible_packets="true"
max_bundle_size="64000"
max_bundle_timeout="30"
use_incoming_packet_handler="true"
- ip_ttl="2"
- enable_bundling="false"
+ enable_bundling="true"
+ enable_unicast_bundling="true"
enable_diagnostics="true"
-
use_concurrent_stack="true"
-
thread_naming_pattern="pl"
-
thread_pool.enabled="true"
thread_pool.min_threads="1"
- thread_pool.max_threads="25"
+ thread_pool.max_threads="4"
thread_pool.keep_alive_time="30000"
thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="10"
- thread_pool.rejection_policy="Run"
-
+ thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard"
oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
+ oob_thread_pool.min_threads="2"
oob_thread_pool.max_threads="4"
oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.queue_enabled="true"
+ oob_thread_pool.queue_enabled="false"
oob_thread_pool.queue_max_size="10"
oob_thread_pool.rejection_policy="Run"/>
-
- <PING timeout="2000" num_initial_members="3"/>
+ <!--<PING timeout="2000" num_initial_members="3"/>-->
+ <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
<MERGE2 max_interval="30000" min_interval="10000"/>
<FD_SOCK/>
<FD timeout="10000" max_tries="5" shun="true"/>
@@ -120,12 +110,14 @@
<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"/>
+ <!--<UNICAST timeout="30,60,120,300,600,1200,2400,3600"/>-->
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false"
+ <pbcast.GMS print_local_addr="true" join_timeout="5000"
+ join_retry_timeout="2000" shun="false"
view_bundling="true" view_ack_collection_timeout="5000"/>
- <FC max_credits="20000000" min_threshold="0.10"/>
+ <FC max_credits="5000000"
+ min_threshold="0.20"/>
<FRAG2 frag_size="60000"/>
<pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
<!-- <pbcast.STATE_TRANSFER/> -->
Modified: core/trunk/src/main/resources/META-INF/replSync-passivation-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/replSync-passivation-service.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/replSync-passivation-service.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -60,43 +60,33 @@
-->
<attribute name="ClusterConfig">
<config>
- <UDP mcast_addr="228.10.10.10"
- mcast_port="45588"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
+ <TCP recv_buf_size="20000000" use_send_queues="false"
loopback="false"
discard_incompatible_packets="true"
max_bundle_size="64000"
max_bundle_timeout="30"
use_incoming_packet_handler="true"
- ip_ttl="2"
- enable_bundling="false"
+ enable_bundling="true"
+ enable_unicast_bundling="true"
enable_diagnostics="true"
-
use_concurrent_stack="true"
-
thread_naming_pattern="pl"
-
thread_pool.enabled="true"
thread_pool.min_threads="1"
- thread_pool.max_threads="25"
+ thread_pool.max_threads="4"
thread_pool.keep_alive_time="30000"
thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="10"
- thread_pool.rejection_policy="Run"
-
+ thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard"
oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
+ oob_thread_pool.min_threads="2"
oob_thread_pool.max_threads="4"
oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.queue_enabled="true"
+ oob_thread_pool.queue_enabled="false"
oob_thread_pool.queue_max_size="10"
oob_thread_pool.rejection_policy="Run"/>
-
- <PING timeout="2000" num_initial_members="3"/>
+ <!--<PING timeout="2000" num_initial_members="3"/>-->
+ <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
<MERGE2 max_interval="30000" min_interval="10000"/>
<FD_SOCK/>
<FD timeout="10000" max_tries="5" shun="true"/>
@@ -104,11 +94,14 @@
<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"/>
+ <!--<UNICAST timeout="30,60,120,300,600,1200,2400,3600"/>-->
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false"
+ <pbcast.GMS print_local_addr="true" join_timeout="5000"
+ join_retry_timeout="2000" shun="false"
view_bundling="true" view_ack_collection_timeout="5000"/>
+ <FC max_credits="5000000"
+ min_threshold="0.20"/>
<FRAG2 frag_size="60000"/>
<pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
<!-- <pbcast.STATE_TRANSFER/> -->
Modified: core/trunk/src/main/resources/META-INF/replSync-service-test.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/replSync-service-test.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/replSync-service-test.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -76,43 +76,33 @@
-->
<attribute name="ClusterConfig">
<config>
- <UDP mcast_addr="228.10.10.10"
- mcast_port="45588"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
+ <TCP recv_buf_size="20000000" use_send_queues="false"
loopback="false"
discard_incompatible_packets="true"
max_bundle_size="64000"
max_bundle_timeout="30"
use_incoming_packet_handler="true"
- ip_ttl="2"
- enable_bundling="false"
+ enable_bundling="true"
+ enable_unicast_bundling="true"
enable_diagnostics="true"
-
use_concurrent_stack="true"
-
thread_naming_pattern="pl"
-
thread_pool.enabled="true"
thread_pool.min_threads="1"
- thread_pool.max_threads="25"
+ thread_pool.max_threads="4"
thread_pool.keep_alive_time="30000"
thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="10"
- thread_pool.rejection_policy="Run"
-
+ thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard"
oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
+ oob_thread_pool.min_threads="2"
oob_thread_pool.max_threads="4"
oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.queue_enabled="true"
+ oob_thread_pool.queue_enabled="false"
oob_thread_pool.queue_max_size="10"
oob_thread_pool.rejection_policy="Run"/>
-
- <PING timeout="2000" num_initial_members="3"/>
+ <!--<PING timeout="2000" num_initial_members="3"/>-->
+ <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
<MERGE2 max_interval="30000" min_interval="10000"/>
<FD_SOCK/>
<FD timeout="10000" max_tries="5" shun="true"/>
@@ -120,11 +110,14 @@
<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"/>
+ <!--<UNICAST timeout="30,60,120,300,600,1200,2400,3600"/>-->
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false"
+ <pbcast.GMS print_local_addr="true" join_timeout="5000"
+ join_retry_timeout="2000" shun="false"
view_bundling="true" view_ack_collection_timeout="5000"/>
+ <FC max_credits="5000000"
+ min_threshold="0.20"/>
<FRAG2 frag_size="60000"/>
<pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
<!-- <pbcast.STATE_TRANSFER/> -->
Modified: core/trunk/src/main/resources/META-INF/replSync-service.xml
===================================================================
--- core/trunk/src/main/resources/META-INF/replSync-service.xml 2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/replSync-service.xml 2008-01-22 17:56:08 UTC (rev 5192)
@@ -76,43 +76,33 @@
-->
<attribute name="ClusterConfig">
<config>
- <UDP mcast_addr="228.10.10.10"
- mcast_port="45588"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
+ <TCP recv_buf_size="20000000" use_send_queues="false"
loopback="false"
discard_incompatible_packets="true"
max_bundle_size="64000"
max_bundle_timeout="30"
use_incoming_packet_handler="true"
- ip_ttl="2"
- enable_bundling="false"
+ enable_bundling="true"
+ enable_unicast_bundling="true"
enable_diagnostics="true"
-
use_concurrent_stack="true"
-
thread_naming_pattern="pl"
-
thread_pool.enabled="true"
thread_pool.min_threads="1"
- thread_pool.max_threads="25"
+ thread_pool.max_threads="4"
thread_pool.keep_alive_time="30000"
thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="10"
- thread_pool.rejection_policy="Run"
-
+ thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard"
oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
+ oob_thread_pool.min_threads="2"
oob_thread_pool.max_threads="4"
oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.queue_enabled="true"
+ oob_thread_pool.queue_enabled="false"
oob_thread_pool.queue_max_size="10"
oob_thread_pool.rejection_policy="Run"/>
-
- <PING timeout="2000" num_initial_members="3"/>
+ <!--<PING timeout="2000" num_initial_members="3"/>-->
+ <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
<MERGE2 max_interval="30000" min_interval="10000"/>
<FD_SOCK/>
<FD timeout="10000" max_tries="5" shun="true"/>
@@ -120,11 +110,14 @@
<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"/>
+ <!--<UNICAST timeout="30,60,120,300,600,1200,2400,3600"/>-->
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false"
+ <pbcast.GMS print_local_addr="true" join_timeout="5000"
+ join_retry_timeout="2000" shun="false"
view_bundling="true" view_ack_collection_timeout="5000"/>
+ <FC max_credits="5000000"
+ min_threshold="0.20"/>
<FRAG2 frag_size="60000"/>
<pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
<!-- <pbcast.STATE_TRANSFER/> -->
More information about the jbosscache-commits
mailing list