Author: galder.zamarreno(a)jboss.com Date: 2009-06-02 13:37:45 -0400 (Tue, 02 Jun 2009) New Revision: 8081 Added: 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 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/lib/infinispan-core.jar benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/lib/jboss-common-core.jar benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/lib/jgroups.jar benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/lib/jta.jar benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/lib/marshalling-api.jar benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/lib/river.jar Log: Updated to ALPHA4 release jars. Added JGroups config files that match the ones used for JBC 3.1. Modified repl config files to uses these JGroups files and also added commented possibility to switch async marshalling off. Added: 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 (rev 0) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/ispn-tcp-sync.xml 2009-06-02 17:37:45 UTC (rev 8081) @@ -0,0 +1,55 @@ +<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> Added: 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 (rev 0) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/ispn-udp-async.xml 2009-06-02 17:37:45 UTC (rev 8081) @@ -0,0 +1,29 @@ +<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> Added: 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 (rev 0) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/ispn-udp-sync.xml 2009-06-02 17:37:45 UTC (rev 8081) @@ -0,0 +1,27 @@ +<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> 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-06-02 17:35:36 UTC (rev 8080) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-async.xml 2009-06-02 17:37:45 UTC (rev 8081) @@ -5,25 +5,33 @@ <global> <transport clusterName="infinispan-cluster"> - <property name="configurationFile" value="tcp.xml"/> + <property name="configurationFile" value="ispn-udp-async.xml"/> </transport> + <asyncTransportExecutor> + <property name="maxThreads" value="1000" /> + <property name="queueSize" value="500000" /> + </asyncTransportExecutor> + </global> <default> <locking - lockAcquisitionTimeout="20000" - concurrencyLevel="10000"/> + lockAcquisitionTimeout="10000" + concurrencyLevel="3000"/> <transaction - transactionManagerLookupClass="org.infinispan.transaction.GenericTransactionManagerLookup" + transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup" syncRollbackPhase="false" syncCommitPhase="false"/> <clustering mode="r"> <stateRetrieval fetchInMemoryState="false"/> <async /> +<!-- + <async asyncMarshalling="false" /> +--> </clustering> </default> 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-06-02 17:35:36 UTC (rev 8080) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-sync.xml 2009-06-02 17:37:45 UTC (rev 8081) @@ -5,7 +5,10 @@ <global> <transport clusterName="infinispan-cluster"> - <property name="configurationFile" value="tcp.xml"/> + <property name="configurationFile" value="ispn-udp-sync.xml"/> +<!-- + <property name="configurationFile" value="ispn-tcp-sync.xml"/> +--> </transport> </global> @@ -17,7 +20,7 @@ concurrencyLevel="10000"/> <transaction - transactionManagerLookupClass="org.infinispan.transaction.GenericTransactionManagerLookup" + transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup" syncRollbackPhase="false" syncCommitPhase="false"/> Modified: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/lib/infinispan-core.jar =================================================================== (Binary files differ) Modified: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/lib/jboss-common-core.jar =================================================================== (Binary files differ) Modified: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/lib/jgroups.jar =================================================================== (Binary files differ) Modified: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/lib/jta.jar =================================================================== (Binary files differ) Modified: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/lib/marshalling-api.jar =================================================================== (Binary files differ) Modified: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/lib/river.jar =================================================================== (Binary files differ)