Author: mircea.markus Date: 2009-10-29 07:54:42 -0400 (Thu, 29 Oct 2009) New Revision: 8272 Added: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/jg_udp_async.xml benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/jg_udp_sync.xml Removed: 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/ispn-tcp-sync.xml benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/ispn-udp-async.xml benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/ispn-udp-sync.xml benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/sync_tcp_ispn.xml benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/sync_udp_ispn.xml Modified: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-async.xml benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-sync.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 benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/udp-dist-sync-l1.xml benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/udp-dist-sync-nol1.xml Log: Updated cfgs Deleted: 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 2009-10-29 11:21:32 UTC (rev 8271) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/async_tcp_ispn.xml 2009-10-29 11:54:42 UTC (rev 8272) @@ -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="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 Deleted: 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 2009-10-29 11:21:32 UTC (rev 8271) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/async_udp_ispn.xml 2009-10-29 11:54:42 UTC (rev 8272) @@ -1,69 +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 - 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> Deleted: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/ispn-tcp-sync.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/ispn-tcp-sync.xml 2009-10-29 11:21:32 UTC (rev 8271) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/ispn-tcp-sync.xml 2009-10-29 11:54:42 UTC (rev 8272) @@ -1,55 +0,0 @@ -<config> - <TCP - singleton_name="tcp_sync" - start_port="7650" - tcp_nodelay="true" - loopback="false" - recv_buf_size="20000000" - send_buf_size="640000" - discard_incompatible_packets="true" - max_bundle_size="64000" - max_bundle_timeout="30" - use_incoming_packet_handler="true" - enable_bundling="false" - use_send_queues="false" - sock_conn_timeout="300" - skip_suspected_members="true" - - use_concurrent_stack="true" - - thread_pool.enabled="true" - thread_pool.min_threads="8" - thread_pool.max_threads="200" - thread_pool.keep_alive_time="5000" - thread_pool.queue_enabled="true" - thread_pool.queue_max_size="1000" - 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"/> - <MPING timeout="2000" - bind_to_all_interfaces="true" - mcast_addr="228.8.8.8" - mcast_port="7500" - ip_ttl="2" - num_initial_members="3" - num_ping_requests="1"/> - <MERGE2 max_interval="30000" min_interval="10000"/> - <FD_SOCK/> - <FD max_tries="5" shun="true" timeout="10000"/> - <VERIFY_SUSPECT timeout="1500"/> - <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" - use_mcast_xmit="false"/> - <UNICAST timeout="300,600,1200,2400,3600"/> - <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/> - <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" - view_bundling="true"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> - <pbcast.FLUSH timeout="0"/> -</config> Deleted: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/ispn-udp-async.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/ispn-udp-async.xml 2009-10-29 11:21:32 UTC (rev 8271) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/ispn-udp-async.xml 2009-10-29 11:54:42 UTC (rev 8272) @@ -1,29 +0,0 @@ -<config> - <UDP discard_incompatible_packets="true" enable_bundling="true" enable_diagnostics="false" ip_ttl="2" - loopback="false" max_bundle_size="64000" max_bundle_timeout="30" mcast_addr="228.10.10.10" - mcast_port="45588" mcast_recv_buf_size="100000000" mcast_send_buf_size="640000" - oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="20" - oob_thread_pool.min_threads="8" oob_thread_pool.queue_enabled="false" - oob_thread_pool.queue_max_size="10" - oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl" thread_pool.enabled="true" - thread_pool.keep_alive_time="10000" thread_pool.max_threads="15" thread_pool.min_threads="8" - thread_pool.queue_enabled="true" thread_pool.queue_max_size="100000" - thread_pool.rejection_policy="Discard" - tos="8" ucast_recv_buf_size="20000000" ucast_send_buf_size="640000" use_concurrent_stack="true" - use_incoming_packet_handler="true"/> - <PING num_initial_members="3" timeout="2000"/> - <MERGE2 max_interval="30000" min_interval="10000"/> - <FD_SOCK/> - <FD max_tries="5" shun="true" timeout="10000"/> - <VERIFY_SUSPECT timeout="1500"/> - <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" - use_mcast_xmit="true"/> - <UNICAST timeout="300,600,1200,2400,3600"/> - <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/> - <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" - view_bundling="true"/> - <FC max_credits="500000" min_threshold="0.2"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> - <pbcast.FLUSH timeout="0"/> -</config> Deleted: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/ispn-udp-sync.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/ispn-udp-sync.xml 2009-10-29 11:21:32 UTC (rev 8271) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/ispn-udp-sync.xml 2009-10-29 11:54:42 UTC (rev 8272) @@ -1,27 +0,0 @@ -<config> - <UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2" - loopback="false" max_bundle_size="64000" max_bundle_timeout="30" mcast_addr="228.10.10.10" - mcast_port="45588" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" - oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4" - oob_thread_pool.min_threads="1" oob_thread_pool.queue_enabled="true" - oob_thread_pool.queue_max_size="10" - oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl" thread_pool.enabled="true" - thread_pool.keep_alive_time="30000" thread_pool.max_threads="25" thread_pool.min_threads="1" - thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run" - tos="8" ucast_recv_buf_size="20000000" ucast_send_buf_size="640000" use_concurrent_stack="true" - use_incoming_packet_handler="true"/> - <PING num_initial_members="3" timeout="2000"/> - <MERGE2 max_interval="30000" min_interval="10000"/> - <FD_SOCK/> - <FD max_tries="5" shun="true" timeout="10000"/> - <VERIFY_SUSPECT timeout="1500"/> - <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" - use_mcast_xmit="false"/> - <UNICAST timeout="300,600,1200,2400,3600"/> - <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/> - <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" - view_bundling="true"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> - <pbcast.FLUSH timeout="0"/> -</config> Added: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/jg_udp_async.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/jg_udp_async.xml (rev 0) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/jg_udp_async.xml 2009-10-29 11:54:42 UTC (rev 8272) @@ -0,0 +1,72 @@ + +<!-- + 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="30" + 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="30" + 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" + + marshaller_pool_size="25" +/> + + <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="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/jg_udp_sync.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/jg_udp_sync.xml (rev 0) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/jg_udp_sync.xml 2009-10-29 11:54:42 UTC (rev 8272) @@ -0,0 +1,72 @@ + +<!-- + 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="false" + enable_diagnostics="false" + thread_naming_pattern="cl" + + thread_pool.enabled="true" + thread_pool.min_threads="2" + thread_pool.max_threads="30" + 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="30" + 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" + + marshaller_pool_size="25" +/> + + <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="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> Modified: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-async.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-async.xml 2009-10-29 11:21:32 UTC (rev 8271) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-async.xml 2009-10-29 11:54:42 UTC (rev 8272) @@ -5,7 +5,7 @@ <global> <transport clusterName="infinispan-cluster"> - <property name="configurationFile" value="ispn-udp-async.xml"/> + <property name="configurationFile" value="jg_udp_async.xml"/> </transport> <asyncTransportExecutor> @@ -18,8 +18,8 @@ <default> <locking - lockAcquisitionTimeout="10000" - concurrencyLevel="3000"/> + lockAcquisitionTimeout="120000" + concurrencyLevel="10000"/> <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup" Modified: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-sync.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-sync.xml 2009-10-29 11:21:32 UTC (rev 8271) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-sync.xml 2009-10-29 11:54:42 UTC (rev 8272) @@ -6,7 +6,7 @@ <transport clusterName="infinispan-cluster"> <properties> - <property name="configurationFile" value="sync_udp_ispn.xml"/> + <property name="configurationFile" value="jg_udp_sync.xml"/> </properties> </transport> @@ -15,7 +15,7 @@ <default> <locking - lockAcquisitionTimeout="20000" + lockAcquisitionTimeout="120000" concurrencyLevel="10000"/> <transaction Deleted: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/sync_tcp_ispn.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/sync_tcp_ispn.xml 2009-10-29 11:21:32 UTC (rev 8271) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/sync_tcp_ispn.xml 2009-10-29 11:54:42 UTC (rev 8272) @@ -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 Deleted: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/sync_udp_ispn.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/sync_udp_ispn.xml 2009-10-29 11:21:32 UTC (rev 8271) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/sync_udp_ispn.xml 2009-10-29 11:54:42 UTC (rev 8272) @@ -1,69 +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 - 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="false" - 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> Modified: 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 2009-10-29 11:21:32 UTC (rev 8271) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/udp-dist-async-l1.xml 2009-10-29 11:54:42 UTC (rev 8272) @@ -6,7 +6,7 @@ <transport clusterName="infinispan-cluster"> <properties> - <property name="configurationFile" value="async_udp_ispn.xml"/> + <property name="configurationFile" value="jg_udp_async.xml"/> </properties> </transport> </global> @@ -19,7 +19,7 @@ transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup" syncRollbackPhase="false" syncCommitPhase="false"/> - + <stateRetrieval fetchInMemoryState="false"/> <clustering mode="distribution"> <async/> <hash numOwners="2" rehashWait="120000" rehashRpcTimeout="600000"/> Modified: 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 2009-10-29 11:21:32 UTC (rev 8271) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/udp-dist-async-nol1.xml 2009-10-29 11:54:42 UTC (rev 8272) @@ -6,7 +6,7 @@ <transport clusterName="infinispan-cluster"> <properties> - <property name="configurationFile" value="async_udp_ispn.xml"/> + <property name="configurationFile" value="jg_udp_async.xml"/> </properties> </transport> </global> @@ -19,6 +19,7 @@ transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup" syncRollbackPhase="false" syncCommitPhase="false"/> + <stateRetrieval fetchInMemoryState="false"/> <clustering mode="distribution"> <async/> Modified: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/udp-dist-sync-l1.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/udp-dist-sync-l1.xml 2009-10-29 11:21:32 UTC (rev 8271) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/udp-dist-sync-l1.xml 2009-10-29 11:54:42 UTC (rev 8272) @@ -6,7 +6,7 @@ <transport clusterName="infinispan-cluster"> <properties> - <property name="configurationFile" value="sync_udp_ispn.xml"/> + <property name="configurationFile" value="jg_udp_sync.xml"/> </properties> </transport> </global> @@ -19,6 +19,7 @@ transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup" syncRollbackPhase="false" syncCommitPhase="false"/> + <stateRetrieval fetchInMemoryState="false"/> <clustering mode="distribution"> <sync replTimeout="120000"/> Modified: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/udp-dist-sync-nol1.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/udp-dist-sync-nol1.xml 2009-10-29 11:21:32 UTC (rev 8271) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/udp-dist-sync-nol1.xml 2009-10-29 11:54:42 UTC (rev 8272) @@ -6,7 +6,7 @@ <transport clusterName="infinispan-cluster"> <properties> - <property name="configurationFile" value="sync_udp_ispn.xml"/> + <property name="configurationFile" value="jg_udp_sync.xml"/> </properties> </transport> </global> @@ -19,6 +19,7 @@ transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup" syncRollbackPhase="false" syncCommitPhase="false"/> + <stateRetrieval fetchInMemoryState="false"/> <clustering mode="distribution"> <sync replTimeout="120000"/>