Author: mircea.markus
Date: 2009-10-21 05:42:24 -0400 (Wed, 21 Oct 2009)
New Revision: 8264
Added:
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/async_tcp_ispn.xml
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/async_udp_ispn.xml
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/tcp-dist-async-l1.xml
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/tcp-dist-async-nol1.xml
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/udp-dist-async-l1.xml
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/udp-dist-async-nol1.xml
Removed:
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/tcp_mping_ispn.xml
Modified:
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.1.0/conf/pess-repl-async.xml
Log:
added async configs
Added:
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/async_tcp_ispn.xml
===================================================================
---
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/async_tcp_ispn.xml
(rev 0)
+++
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/async_tcp_ispn.xml 2009-10-21
09:42:24 UTC (rev 8264)
@@ -0,0 +1,71 @@
+<!--
+ 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
+ version: $Id: tcp.xml,v 1.32 2009/07/20 12:28:22 belaban Exp $
+-->
+<config xmlns="urn:org:jgroups"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:org:jgroups file:schema/JGroups-2.8.xsd">
+ <TCP bind_port="7800"
+ loopback="true"
+ recv_buf_size="${tcp.recv_buf_size:20000000}"
+ send_buf_size="${tcp.send_buf_size:640000}"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ enable_bundling="true"
+ use_send_queues="false"
+ sock_conn_timeout="300"
+ skip_suspected_members="true"
+
+ 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="run"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="100"
+ oob_thread_pool.rejection_policy="run"/>
+
+ <!--<MPING timeout="4000"-->
+ <!--receive_on_all_interfaces="true"-->
+ <!--mcast_addr="228.8.8.8"-->
+ <!--mcast_port="7500"-->
+ <!--ip_ttl="8"-->
+ <!--num_initial_members="2"-->
+ <!--num_ping_requests="1"/>-->
+ <!---->
+
+ <FILE_PING location="file_ping_dir"/>
+ <MERGE2 max_interval="30000"
+ min_interval="10000"/>
+ <FD_SOCK/>
+ <FD timeout="10000" max_tries="5" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <BARRIER />
+ <pbcast.NAKACK
+ use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,1200" />
+ <pbcast.STABLE stability_delay="1000"
desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+
+ view_bundling="true"/>
+ <FC max_credits="2000000"
+ min_threshold="0.10"/>
+ <FRAG2 frag_size="60000" />
+ <pbcast.STREAMING_STATE_TRANSFER/>
+ <pbcast.FLUSH timeout="0"/>
+</config>
\ No newline at end of file
Added:
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/async_udp_ispn.xml
===================================================================
---
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/async_udp_ispn.xml
(rev 0)
+++
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/async_udp_ispn.xml 2009-10-21
09:42:24 UTC (rev 8264)
@@ -0,0 +1,69 @@
+
+<!--
+ 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
+ version: $Id: udp.xml,v 1.33 2009/08/28 09:04:07 belaban Exp $
+-->
+
+<config xmlns="urn:org:jgroups"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:org:jgroups file:schema/JGroups-2.8.xsd">
+ <UDP
+ mcast_addr="${jgroups.udp.mcast_addr:232.10.10.10}"
+ mcast_port="${jgroups.udp.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"
+ ip_ttl="${jgroups.udp.ip_ttl:2}"
+ enable_bundling="true"
+ enable_diagnostics="false"
+ thread_naming_pattern="cl"
+
+ 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"/>
+
+ <FILE_PING location="file_ping_dir"/>
+ <MERGE2 max_interval="30000"
+ min_interval="10000"/>
+ <FD_SOCK/>
+ <FD_ALL/>
+ <VERIFY_SUSPECT timeout="1500" />
+ <BARRIER />
+ <pbcast.NAKACK use_stats_for_retransmission="false"
+ exponential_backoff="0"
+ use_mcast_xmit="true" gc_lag="0"
+ retransmit_timeout="50,300,600,1200"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,1200"/>
+ <pbcast.STABLE stability_delay="1000"
desired_avg_gossip="50000"
+ max_bytes="1000000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+
+ view_bundling="true"/>
+ <FC max_credits="500000"
+ min_threshold="0.20"/>
+ <FRAG2 frag_size="60000" />
+ <!--pbcast.STREAMING_STATE_TRANSFER /-->
+ <pbcast.STATE_TRANSFER />
+ <pbcast.FLUSH />
+</config>
Added:
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/tcp-dist-async-l1.xml
===================================================================
---
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/tcp-dist-async-l1.xml
(rev 0)
+++
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/tcp-dist-async-l1.xml 2009-10-21
09:42:24 UTC (rev 8264)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<infinispan
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:infinispan:config:4.0">
+
+ <global>
+
+ <transport clusterName="infinispan-cluster">
+ <properties>
+ <property name="configurationFile"
value="async_tcp_ispn.xml"/>
+ </properties>
+ </transport>
+ </global>
+
+ <default>
+ <locking
+ lockAcquisitionTimeout="120000"
+ concurrencyLevel="10000"/>
+ <transaction
+
transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup"
+ syncRollbackPhase="false"
+ syncCommitPhase="false"/>
+
+ <clustering mode="distribution">
+ <async/>
+ <hash numOwners="2" rehashWait="120000"
rehashRpcTimeout="600000"/>
+ <l1 enabled="true" lifespan="600000"/>
+ </clustering>
+ </default>
+
+</infinispan>
Copied:
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/tcp-dist-async-nol1.xml
(from rev 8262,
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/tcp-dist-sync-nol1.xml)
===================================================================
---
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/tcp-dist-async-nol1.xml
(rev 0)
+++
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/tcp-dist-async-nol1.xml 2009-10-21
09:42:24 UTC (rev 8264)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<infinispan
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:infinispan:config:4.0">
+
+ <global>
+
+ <transport clusterName="infinispan-cluster">
+ <properties>
+ <property name="configurationFile"
value="async_tcp_ispn.xml"/>
+ </properties>
+ </transport>
+ </global>
+
+ <default>
+ <locking
+ lockAcquisitionTimeout="120000"
+ concurrencyLevel="10000"/>
+ <transaction
+
transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup"
+ syncRollbackPhase="false"
+ syncCommitPhase="false"/>
+
+ <clustering mode="distribution">
+ <async/>
+ <hash numOwners="2" rehashWait="120000"
rehashRpcTimeout="600000"/>
+ <l1 enabled="false" lifespan="600000"/>
+ </clustering>
+ </default>
+
+</infinispan>
Deleted:
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/tcp_mping_ispn.xml
===================================================================
---
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/tcp_mping_ispn.xml 2009-10-21
09:25:11 UTC (rev 8263)
+++
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/tcp_mping_ispn.xml 2009-10-21
09:42:24 UTC (rev 8264)
@@ -1,71 +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
- version: $Id: tcp.xml,v 1.32 2009/07/20 12:28:22 belaban Exp $
--->
-<config xmlns="urn:org:jgroups"
-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:org:jgroups file:schema/JGroups-2.8.xsd">
- <TCP bind_port="7800"
- loopback="true"
- recv_buf_size="${tcp.recv_buf_size:20000000}"
- send_buf_size="${tcp.send_buf_size:640000}"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- enable_bundling="false"
- use_send_queues="false"
- sock_conn_timeout="300"
- skip_suspected_members="true"
-
- 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="run"
-
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="8"
- oob_thread_pool.keep_alive_time="5000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="100"
- oob_thread_pool.rejection_policy="run"/>
-
- <!--<MPING timeout="4000"-->
- <!--receive_on_all_interfaces="true"-->
- <!--mcast_addr="228.8.8.8"-->
- <!--mcast_port="7500"-->
- <!--ip_ttl="8"-->
- <!--num_initial_members="2"-->
- <!--num_ping_requests="1"/>-->
- <!---->
-
- <FILE_PING location="file_ping_dir"/>
- <MERGE2 max_interval="30000"
- min_interval="10000"/>
- <FD_SOCK/>
- <FD timeout="10000" max_tries="5" />
- <VERIFY_SUSPECT timeout="1500" />
- <BARRIER />
- <pbcast.NAKACK
- use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200" />
- <pbcast.STABLE stability_delay="1000"
desired_avg_gossip="50000"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
-
- view_bundling="true"/>
- <FC max_credits="2000000"
- min_threshold="0.10"/>
- <FRAG2 frag_size="60000" />
- <pbcast.STREAMING_STATE_TRANSFER/>
- <pbcast.FLUSH timeout="0"/>
-</config>
\ No newline at end of file
Added:
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/udp-dist-async-l1.xml
===================================================================
---
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/udp-dist-async-l1.xml
(rev 0)
+++
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/udp-dist-async-l1.xml 2009-10-21
09:42:24 UTC (rev 8264)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<infinispan
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:infinispan:config:4.0">
+
+ <global>
+
+ <transport clusterName="infinispan-cluster">
+ <properties>
+ <property name="configurationFile"
value="async_udp_ispn.xml"/>
+ </properties>
+ </transport>
+ </global>
+
+ <default>
+ <locking
+ lockAcquisitionTimeout="120000"
+ concurrencyLevel="10000"/>
+ <transaction
+
transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup"
+ syncRollbackPhase="false"
+ syncCommitPhase="false"/>
+
+ <clustering mode="distribution">
+ <async/>
+ <hash numOwners="2" rehashWait="120000"
rehashRpcTimeout="600000"/>
+ <l1 enabled="true" lifespan="600000"/>
+ </clustering>
+ </default>
+
+</infinispan>
Added:
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/udp-dist-async-nol1.xml
===================================================================
---
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/udp-dist-async-nol1.xml
(rev 0)
+++
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/udp-dist-async-nol1.xml 2009-10-21
09:42:24 UTC (rev 8264)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<infinispan
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:infinispan:config:4.0">
+
+ <global>
+
+ <transport clusterName="infinispan-cluster">
+ <properties>
+ <property name="configurationFile"
value="async_udp_ispn.xml"/>
+ </properties>
+ </transport>
+ </global>
+
+ <default>
+ <locking
+ lockAcquisitionTimeout="120000"
+ concurrencyLevel="10000"/>
+ <transaction
+
transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup"
+ syncRollbackPhase="false"
+ syncCommitPhase="false"/>
+
+ <clustering mode="distribution">
+ <async/>
+ <hash numOwners="2" rehashWait="120000"
rehashRpcTimeout="600000"/>
+ <l1 enabled="false"/>
+ </clustering>
+ </default>
+
+</infinispan>
Modified:
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.1.0/conf/pess-repl-async.xml
===================================================================
---
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.1.0/conf/pess-repl-async.xml 2009-10-21
09:25:11 UTC (rev 8263)
+++
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.1.0/conf/pess-repl-async.xml 2009-10-21
09:42:24 UTC (rev 8264)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
<locking isolationLevel="REPEATABLE_READ"
lockAcquisitionTimeout="10000" nodeLockingScheme="pessimistic"/>
<transaction
transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<clustering clusterName="JBossCache-Cluster">