[exo-jcr-commits] exo-jcr SVN: r5562 - in jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src: main/resources/conf/portal and 1 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Feb 2 05:04:19 EST 2012
Author: nzamosenchuk
Date: 2012-02-02 05:04:17 -0500 (Thu, 02 Feb 2012)
New Revision: 5562
Added:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/tcp-mux-v3.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/udp-mux-v3.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/tcp-mux-v3.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/udp-mux-v3.xml
Removed:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/tcp-mux.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/udp-mux.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/tcp-mux.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/udp-mux.xml
Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/cache-server-configuration.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/exo-jcr-ispn-config.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-configuration.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config.xml
Log:
EXOJCR-1742 : separate JGroups v2 and v3 configs using suffixes -v3
Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/cache-server-configuration.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/cache-server-configuration.xml 2012-02-02 09:50:14 UTC (rev 5561)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/cache-server-configuration.xml 2012-02-02 10:04:17 UTC (rev 5562)
@@ -31,13 +31,13 @@
<properties-param>
<name>parameters</name>
<description>The parameters of the configuration</description>
- <property name="configurationFile" value="udp-mux.xml"></property>
+ <property name="configurationFile" value="udp-mux-v3.xml"></property>
<property name="invalidationThreshold" value="0"></property>
</properties-param>
<properties-param profiles="tcp">
<name>parameters</name>
<description>The parameters of the configuration</description>
- <property name="configurationFile" value="tcp-mux.xml"></property>
+ <property name="configurationFile" value="tcp-mux-v3.xml"></property>
<property name="invalidationThreshold" value="-1"></property>
</properties-param>
</init-params>
Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/exo-jcr-ispn-config.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/exo-jcr-ispn-config.xml 2012-02-02 09:50:14 UTC (rev 5561)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/exo-jcr-ispn-config.xml 2012-02-02 10:04:17 UTC (rev 5562)
@@ -55,7 +55,7 @@
class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache">
<properties>
<property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-data.xml" />
- <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" />
+ <property name="jgroups-configuration" value="jar:/conf/udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
</properties>
</cache>
@@ -64,7 +64,7 @@
<property name="index-dir" value="${exo.jcr.parent.dir:..}/temp/jcrlucenedb/production" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" />
<property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-indexer.xml" />
- <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" />
+ <property name="jgroups-configuration" value="jar:/conf/udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="max-volatile-time" value="60" />
</properties>
@@ -73,7 +73,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-lock.xml" />
- <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" />
+ <property name="jgroups-configuration" value="jar:/conf/udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name" value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
@@ -116,7 +116,7 @@
class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache">
<properties>
<property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-data.xml" />
- <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" />
+ <property name="jgroups-configuration" value="jar:/conf/udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
</properties>
</cache>
@@ -125,7 +125,7 @@
<property name="index-dir" value="${exo.jcr.parent.dir:..}/temp/jcrlucenedb/backup" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" />
<property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-indexer.xml" />
- <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" />
+ <property name="jgroups-configuration" value="jar:/conf/udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="max-volatile-time" value="60" />
</properties>
@@ -134,7 +134,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-lock.xml" />
- <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" />
+ <property name="jgroups-configuration" value="jar:/conf/udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name" value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
@@ -177,7 +177,7 @@
class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache">
<properties>
<property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-data.xml" />
- <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" />
+ <property name="jgroups-configuration" value="jar:/conf/udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
</properties>
</cache>
@@ -186,7 +186,7 @@
<property name="index-dir" value="${exo.jcr.parent.dir:..}/temp/jcrlucenedb/digital-assets" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" />
<property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-indexer.xml" />
- <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" />
+ <property name="jgroups-configuration" value="jar:/conf/udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="max-volatile-time" value="60" />
</properties>
@@ -195,7 +195,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-lock.xml" />
- <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" />
+ <property name="jgroups-configuration" value="jar:/conf/udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name" value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
Copied: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/tcp-mux-v3.xml (from rev 5548, jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/tcp-mux.xml)
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/tcp-mux-v3.xml (rev 0)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/tcp-mux-v3.xml 2012-02-02 10:04:17 UTC (rev 5562)
@@ -0,0 +1,70 @@
+<!--
+ 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]
+ author: Bela Ban
+-->
+<config xmlns="urn:org:jgroups"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/JGroups-3.0.xsd">
+ <TCP singleton_name="JCR-cluster"
+ bind_port="7800"
+ loopback="false"
+ recv_buf_size="${tcp.recv_buf_size:20M}"
+ send_buf_size="${tcp.send_buf_size:640K}"
+ discard_incompatible_packets="true"
+ max_bundle_size="64K"
+ max_bundle_timeout="30"
+ enable_bundling="true"
+ use_send_queues="true"
+ sock_conn_timeout="300"
+
+ timer_type="new"
+ timer.min_threads="4"
+ timer.max_threads="10"
+ timer.keep_alive_time="3000"
+ timer.queue_max_size="500"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="10"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="false"
+ thread_pool.queue_max_size="100"
+ thread_pool.rejection_policy="discard"
+
+ 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="discard"/>
+
+ <TCPPING timeout="3000"
+ initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7800],localhost[7801]}"
+ port_range="1"
+ num_initial_members="3"/>
+ <MERGE2 min_interval="10000"
+ max_interval="30000"/>
+ <FD_SOCK/>
+ <FD timeout="3000" max_tries="3" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <BARRIER />
+ <pbcast.NAKACK use_mcast_xmit="false"
+ exponential_backoff="500"
+ discard_delivered_msgs="true"/>
+ <UNICAST />
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="4M"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+
+ view_bundling="true"/>
+ <UFC max_credits="2M"
+ min_threshold="0.4"/>
+ <MFC max_credits="2M"
+ min_threshold="0.4"/>
+ <FRAG2 frag_size="60K" />
+ <pbcast.STATE_TRANSFER/>
+</config>
\ No newline at end of file
Deleted: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/tcp-mux.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/tcp-mux.xml 2012-02-02 09:50:14 UTC (rev 5561)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/tcp-mux.xml 2012-02-02 10:04:17 UTC (rev 5562)
@@ -1,70 +0,0 @@
-<!--
- 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]
- author: Bela Ban
--->
-<config xmlns="urn:org:jgroups"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/JGroups-3.0.xsd">
- <TCP singleton_name="JCR-cluster"
- bind_port="7800"
- loopback="false"
- recv_buf_size="${tcp.recv_buf_size:20M}"
- send_buf_size="${tcp.send_buf_size:640K}"
- discard_incompatible_packets="true"
- max_bundle_size="64K"
- max_bundle_timeout="30"
- enable_bundling="true"
- use_send_queues="true"
- sock_conn_timeout="300"
-
- timer_type="new"
- timer.min_threads="4"
- timer.max_threads="10"
- timer.keep_alive_time="3000"
- timer.queue_max_size="500"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="10"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false"
- thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="discard"
-
- 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="discard"/>
-
- <TCPPING timeout="3000"
- initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7800],localhost[7801]}"
- port_range="1"
- num_initial_members="3"/>
- <MERGE2 min_interval="10000"
- max_interval="30000"/>
- <FD_SOCK/>
- <FD timeout="3000" max_tries="3" />
- <VERIFY_SUSPECT timeout="1500" />
- <BARRIER />
- <pbcast.NAKACK use_mcast_xmit="false"
- exponential_backoff="500"
- discard_delivered_msgs="true"/>
- <UNICAST />
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="4M"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
-
- view_bundling="true"/>
- <UFC max_credits="2M"
- min_threshold="0.4"/>
- <MFC max_credits="2M"
- min_threshold="0.4"/>
- <FRAG2 frag_size="60K" />
- <pbcast.STATE_TRANSFER/>
-</config>
\ No newline at end of file
Copied: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/udp-mux-v3.xml (from rev 5548, jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/udp-mux.xml)
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/udp-mux-v3.xml (rev 0)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/udp-mux-v3.xml 2012-02-02 10:04:17 UTC (rev 5562)
@@ -0,0 +1,74 @@
+
+<!--
+ Default stack using IP multicasting. It is similar to the "udp"
+ stack in stacks.xml, but doesn't use streaming state transfer and flushing
+ author: Bela Ban
+-->
+
+<config xmlns="urn:org:jgroups"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/JGroups-3.0.xsd">
+ <UDP
+ singleton_name="JCR-cluster"
+ mcast_port="${jgroups.udp.mcast_port:45588}"
+ tos="8"
+ ucast_recv_buf_size="20M"
+ ucast_send_buf_size="640K"
+ mcast_recv_buf_size="25M"
+ mcast_send_buf_size="640K"
+ loopback="true"
+ discard_incompatible_packets="true"
+ max_bundle_size="64K"
+ max_bundle_timeout="30"
+ ip_ttl="${jgroups.udp.ip_ttl:8}"
+ enable_bundling="true"
+ enable_diagnostics="true"
+ thread_naming_pattern="cl"
+
+ timer_type="new"
+ timer.min_threads="4"
+ timer.max_threads="10"
+ timer.keep_alive_time="3000"
+ timer.queue_max_size="500"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="2"
+ thread_pool.max_threads="8"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="10000"
+ thread_pool.rejection_policy="discard"
+
+ 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="30000"
+ min_interval="10000"/>
+ <FD_SOCK/>
+ <FD_ALL/>
+ <VERIFY_SUSPECT timeout="1500" />
+ <BARRIER />
+ <pbcast.NAKACK exponential_backoff="300"
+ xmit_stagger_timeout="200"
+ use_mcast_xmit="false"
+ discard_delivered_msgs="true"/>
+ <UNICAST />
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="4M"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+ view_bundling="true"/>
+ <UFC max_credits="2M"
+ min_threshold="0.4"/>
+ <MFC max_credits="2M"
+ min_threshold="0.4"/>
+ <FRAG2 frag_size="60K" />
+ <pbcast.STATE_TRANSFER />
+ <!-- pbcast.FLUSH /-->
+</config>
\ No newline at end of file
Deleted: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/udp-mux.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/udp-mux.xml 2012-02-02 09:50:14 UTC (rev 5561)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/udp-mux.xml 2012-02-02 10:04:17 UTC (rev 5562)
@@ -1,74 +0,0 @@
-
-<!--
- Default stack using IP multicasting. It is similar to the "udp"
- stack in stacks.xml, but doesn't use streaming state transfer and flushing
- author: Bela Ban
--->
-
-<config xmlns="urn:org:jgroups"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/JGroups-3.0.xsd">
- <UDP
- singleton_name="JCR-cluster"
- mcast_port="${jgroups.udp.mcast_port:45588}"
- tos="8"
- ucast_recv_buf_size="20M"
- ucast_send_buf_size="640K"
- mcast_recv_buf_size="25M"
- mcast_send_buf_size="640K"
- loopback="true"
- discard_incompatible_packets="true"
- max_bundle_size="64K"
- max_bundle_timeout="30"
- ip_ttl="${jgroups.udp.ip_ttl:8}"
- enable_bundling="true"
- enable_diagnostics="true"
- thread_naming_pattern="cl"
-
- timer_type="new"
- timer.min_threads="4"
- timer.max_threads="10"
- timer.keep_alive_time="3000"
- timer.queue_max_size="500"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="2"
- thread_pool.max_threads="8"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="10000"
- thread_pool.rejection_policy="discard"
-
- 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="30000"
- min_interval="10000"/>
- <FD_SOCK/>
- <FD_ALL/>
- <VERIFY_SUSPECT timeout="1500" />
- <BARRIER />
- <pbcast.NAKACK exponential_backoff="300"
- xmit_stagger_timeout="200"
- use_mcast_xmit="false"
- discard_delivered_msgs="true"/>
- <UNICAST />
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="4M"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
- view_bundling="true"/>
- <UFC max_credits="2M"
- min_threshold="0.4"/>
- <MFC max_credits="2M"
- min_threshold="0.4"/>
- <FRAG2 frag_size="60K" />
- <pbcast.STATE_TRANSFER />
- <!-- pbcast.FLUSH /-->
-</config>
\ No newline at end of file
Copied: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/tcp-mux-v3.xml (from rev 5548, jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/tcp-mux.xml)
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/tcp-mux-v3.xml (rev 0)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/tcp-mux-v3.xml 2012-02-02 10:04:17 UTC (rev 5562)
@@ -0,0 +1,70 @@
+<!--
+ 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]
+ author: Bela Ban
+-->
+<config xmlns="urn:org:jgroups"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/JGroups-3.0.xsd">
+ <TCP singleton_name="JCR-cluster"
+ bind_port="7800"
+ loopback="false"
+ recv_buf_size="${tcp.recv_buf_size:20M}"
+ send_buf_size="${tcp.send_buf_size:640K}"
+ discard_incompatible_packets="true"
+ max_bundle_size="64K"
+ max_bundle_timeout="30"
+ enable_bundling="true"
+ use_send_queues="true"
+ sock_conn_timeout="300"
+
+ timer_type="new"
+ timer.min_threads="4"
+ timer.max_threads="10"
+ timer.keep_alive_time="3000"
+ timer.queue_max_size="500"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="10"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="false"
+ thread_pool.queue_max_size="100"
+ thread_pool.rejection_policy="discard"
+
+ 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="discard"/>
+
+ <TCPPING timeout="3000"
+ initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7800],localhost[7801]}"
+ port_range="1"
+ num_initial_members="3"/>
+ <MERGE2 min_interval="10000"
+ max_interval="30000"/>
+ <FD_SOCK/>
+ <FD timeout="3000" max_tries="3" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <BARRIER />
+ <pbcast.NAKACK use_mcast_xmit="false"
+ exponential_backoff="500"
+ discard_delivered_msgs="true"/>
+ <UNICAST />
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="4M"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+
+ view_bundling="true"/>
+ <UFC max_credits="2M"
+ min_threshold="0.4"/>
+ <MFC max_credits="2M"
+ min_threshold="0.4"/>
+ <FRAG2 frag_size="60K" />
+ <pbcast.STATE_TRANSFER/>
+</config>
\ No newline at end of file
Deleted: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/tcp-mux.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/tcp-mux.xml 2012-02-02 09:50:14 UTC (rev 5561)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/tcp-mux.xml 2012-02-02 10:04:17 UTC (rev 5562)
@@ -1,70 +0,0 @@
-<!--
- 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]
- author: Bela Ban
--->
-<config xmlns="urn:org:jgroups"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/JGroups-3.0.xsd">
- <TCP singleton_name="JCR-cluster"
- bind_port="7800"
- loopback="false"
- recv_buf_size="${tcp.recv_buf_size:20M}"
- send_buf_size="${tcp.send_buf_size:640K}"
- discard_incompatible_packets="true"
- max_bundle_size="64K"
- max_bundle_timeout="30"
- enable_bundling="true"
- use_send_queues="true"
- sock_conn_timeout="300"
-
- timer_type="new"
- timer.min_threads="4"
- timer.max_threads="10"
- timer.keep_alive_time="3000"
- timer.queue_max_size="500"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="10"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false"
- thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="discard"
-
- 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="discard"/>
-
- <TCPPING timeout="3000"
- initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7800],localhost[7801]}"
- port_range="1"
- num_initial_members="3"/>
- <MERGE2 min_interval="10000"
- max_interval="30000"/>
- <FD_SOCK/>
- <FD timeout="3000" max_tries="3" />
- <VERIFY_SUSPECT timeout="1500" />
- <BARRIER />
- <pbcast.NAKACK use_mcast_xmit="false"
- exponential_backoff="500"
- discard_delivered_msgs="true"/>
- <UNICAST />
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="4M"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
-
- view_bundling="true"/>
- <UFC max_credits="2M"
- min_threshold="0.4"/>
- <MFC max_credits="2M"
- min_threshold="0.4"/>
- <FRAG2 frag_size="60K" />
- <pbcast.STATE_TRANSFER/>
-</config>
\ No newline at end of file
Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-configuration.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-configuration.xml 2012-02-02 09:50:14 UTC (rev 5561)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-configuration.xml 2012-02-02 10:04:17 UTC (rev 5562)
@@ -229,7 +229,7 @@
<init-params>
<value-param>
<name>jgroups-configuration</name>
- <value>jar:/conf/standalone/cluster/udp-mux.xml</value>
+ <value>jar:/conf/standalone/cluster/udp-mux-v3.xml</value>
</value-param>
<value-param>
<name>jgroups-cluster-name</name>
Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2012-02-02 09:50:14 UTC (rev 5561)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2012-02-02 10:04:17 UTC (rev 5562)
@@ -56,7 +56,7 @@
class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache">
<properties>
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="use-distributed-cache" value="${use-distributed-cache}" />
</properties>
@@ -66,7 +66,7 @@
<property name="index-dir" value="target/temp/index/db1/ws" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="max-volatile-time" value="60" />
</properties>
@@ -75,7 +75,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name" value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
@@ -116,7 +116,7 @@
class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache">
<properties>
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="use-distributed-cache" value="${use-distributed-cache}" />
</properties>
@@ -125,7 +125,7 @@
<properties>
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="max-volatile-time" value="60" />
<property name="index-dir" value="target/temp/index/db1/ws1" />
@@ -143,7 +143,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name" value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
@@ -184,7 +184,7 @@
class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache">
<properties>
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="use-distributed-cache" value="${use-distributed-cache}" />
</properties>
@@ -193,7 +193,7 @@
<properties>
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="max-volatile-time" value="60" />
<property name="index-dir" value="target/temp/index/db1/ws2" />
@@ -211,7 +211,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name" value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
@@ -276,7 +276,7 @@
class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache">
<properties>
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="use-distributed-cache" value="${use-distributed-cache}" />
</properties>
@@ -285,7 +285,7 @@
<properties>
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="max-volatile-time" value="60" />
<property name="index-dir" value="target/temp/index/db1/ws3" />
@@ -303,7 +303,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name" value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
@@ -361,7 +361,7 @@
class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache">
<properties>
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="use-distributed-cache" value="${use-distributed-cache}" />
</properties>
@@ -370,7 +370,7 @@
<properties>
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="max-volatile-time" value="60" />
<property name="index-dir" value="target/temp/index/db2/ws" />
@@ -380,7 +380,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name" value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
@@ -427,7 +427,7 @@
class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache">
<properties>
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="use-distributed-cache" value="${use-distributed-cache}" />
</properties>
@@ -436,7 +436,7 @@
<properties>
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="max-volatile-time" value="60" />
<property name="index-dir" value="target/temp/index/db2/ws1" />
@@ -446,7 +446,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name" value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
@@ -504,7 +504,7 @@
class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache">
<properties>
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="use-distributed-cache" value="${use-distributed-cache}" />
</properties>
@@ -513,7 +513,7 @@
<properties>
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="max-volatile-time" value="60" />
<property name="index-dir" value="target/temp/index/db1tck/ws" />
@@ -532,7 +532,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name" value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
@@ -580,7 +580,7 @@
class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache">
<properties>
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="use-distributed-cache" value="${use-distributed-cache}" />
</properties>
@@ -589,7 +589,7 @@
<properties>
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="max-volatile-time" value="60" />
<property name="index-dir" value="target/temp/index/db1tck/ws1" />
@@ -607,7 +607,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name" value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
@@ -655,7 +655,7 @@
class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache">
<properties>
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="use-distributed-cache" value="${use-distributed-cache}" />
</properties>
@@ -664,7 +664,7 @@
<properties>
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="max-volatile-time" value="60" />
<property name="index-dir" value="target/temp/index/db1tck/ws2" />
@@ -685,7 +685,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
- <property name="jgroups-configuration" value="udp-mux.xml" />
+ <property name="jgroups-configuration" value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name" value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
Copied: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/udp-mux-v3.xml (from rev 5548, jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/udp-mux.xml)
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/udp-mux-v3.xml (rev 0)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/udp-mux-v3.xml 2012-02-02 10:04:17 UTC (rev 5562)
@@ -0,0 +1,74 @@
+
+<!--
+ Default stack using IP multicasting. It is similar to the "udp"
+ stack in stacks.xml, but doesn't use streaming state transfer and flushing
+ author: Bela Ban
+-->
+
+<config xmlns="urn:org:jgroups"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/JGroups-3.0.xsd">
+ <UDP
+ singleton_name="JCR-cluster"
+ mcast_port="${jgroups.udp.mcast_port:45588}"
+ tos="8"
+ ucast_recv_buf_size="20M"
+ ucast_send_buf_size="640K"
+ mcast_recv_buf_size="25M"
+ mcast_send_buf_size="640K"
+ loopback="true"
+ discard_incompatible_packets="true"
+ max_bundle_size="64K"
+ max_bundle_timeout="30"
+ ip_ttl="${jgroups.udp.ip_ttl:8}"
+ enable_bundling="true"
+ enable_diagnostics="true"
+ thread_naming_pattern="cl"
+
+ timer_type="new"
+ timer.min_threads="4"
+ timer.max_threads="10"
+ timer.keep_alive_time="3000"
+ timer.queue_max_size="500"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="2"
+ thread_pool.max_threads="8"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="10000"
+ thread_pool.rejection_policy="discard"
+
+ 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="30000"
+ min_interval="10000"/>
+ <FD_SOCK/>
+ <FD_ALL/>
+ <VERIFY_SUSPECT timeout="1500" />
+ <BARRIER />
+ <pbcast.NAKACK exponential_backoff="300"
+ xmit_stagger_timeout="200"
+ use_mcast_xmit="false"
+ discard_delivered_msgs="true"/>
+ <UNICAST />
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="4M"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+ view_bundling="true"/>
+ <UFC max_credits="2M"
+ min_threshold="0.4"/>
+ <MFC max_credits="2M"
+ min_threshold="0.4"/>
+ <FRAG2 frag_size="60K" />
+ <pbcast.STATE_TRANSFER />
+ <!-- pbcast.FLUSH /-->
+</config>
\ No newline at end of file
Deleted: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/udp-mux.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/udp-mux.xml 2012-02-02 09:50:14 UTC (rev 5561)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/udp-mux.xml 2012-02-02 10:04:17 UTC (rev 5562)
@@ -1,74 +0,0 @@
-
-<!--
- Default stack using IP multicasting. It is similar to the "udp"
- stack in stacks.xml, but doesn't use streaming state transfer and flushing
- author: Bela Ban
--->
-
-<config xmlns="urn:org:jgroups"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/JGroups-3.0.xsd">
- <UDP
- singleton_name="JCR-cluster"
- mcast_port="${jgroups.udp.mcast_port:45588}"
- tos="8"
- ucast_recv_buf_size="20M"
- ucast_send_buf_size="640K"
- mcast_recv_buf_size="25M"
- mcast_send_buf_size="640K"
- loopback="true"
- discard_incompatible_packets="true"
- max_bundle_size="64K"
- max_bundle_timeout="30"
- ip_ttl="${jgroups.udp.ip_ttl:8}"
- enable_bundling="true"
- enable_diagnostics="true"
- thread_naming_pattern="cl"
-
- timer_type="new"
- timer.min_threads="4"
- timer.max_threads="10"
- timer.keep_alive_time="3000"
- timer.queue_max_size="500"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="2"
- thread_pool.max_threads="8"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="10000"
- thread_pool.rejection_policy="discard"
-
- 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="30000"
- min_interval="10000"/>
- <FD_SOCK/>
- <FD_ALL/>
- <VERIFY_SUSPECT timeout="1500" />
- <BARRIER />
- <pbcast.NAKACK exponential_backoff="300"
- xmit_stagger_timeout="200"
- use_mcast_xmit="false"
- discard_delivered_msgs="true"/>
- <UNICAST />
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="4M"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
- view_bundling="true"/>
- <UFC max_credits="2M"
- min_threshold="0.4"/>
- <MFC max_credits="2M"
- min_threshold="0.4"/>
- <FRAG2 frag_size="60K" />
- <pbcast.STATE_TRANSFER />
- <!-- pbcast.FLUSH /-->
-</config>
\ No newline at end of file
More information about the exo-jcr-commits
mailing list