JBoss Cache SVN: r7764 - in benchmarks/benchmark-fwk/trunk: cache-products and 5 other directories.
by jbosscache-commits@lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-02-23 09:05:27 -0500 (Mon, 23 Feb 2009)
New Revision: 7764
Added:
benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.6.0/
benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.6.0/config.sh
benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.6.0/src/
benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.6.0/src/org/
benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.6.0/src/org/cachebench/
benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.6.0/src/org/cachebench/cachewrappers/
benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.6.0/src/org/cachebench/cachewrappers/EHCacheReplicationTest.java
benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.6.0/src/org/cachebench/cachewrappers/EHCacheTest.java
benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.6.0/src/org/cachebench/cachewrappers/EHCacheWrapper.java
benchmarks/benchmark-fwk/trunk/runAllLocalRC.sh
Log:
EHCache 1.6.0
Added: benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.6.0/config.sh
===================================================================
Added: benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.6.0/src/org/cachebench/cachewrappers/EHCacheReplicationTest.java
===================================================================
Added: benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.6.0/src/org/cachebench/cachewrappers/EHCacheTest.java
===================================================================
Added: benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.6.0/src/org/cachebench/cachewrappers/EHCacheWrapper.java
===================================================================
Added: benchmarks/benchmark-fwk/trunk/runAllLocalRC.sh
===================================================================
14 years
JBoss Cache SVN: r7763 - benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf.
by jbosscache-commits@lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-02-23 08:57:25 -0500 (Mon, 23 Feb 2009)
New Revision: 7763
Modified:
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RC.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RR.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-async-br.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-async.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-sync-br.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-sync.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async-br.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync-br.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local-NONE.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async-br.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync-br.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync.xml
Log:
Updated config files
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RC.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RC.xml 2009-02-23 13:50:24 UTC (rev 7762)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RC.xml 2009-02-23 13:57:25 UTC (rev 7763)
@@ -1,8 +1,7 @@
<?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">
- <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="600000" nodeLockingScheme="mvcc" concurrencyLevel="3000"
- lockParentForChildInsertRemove="true"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
- <transport clusterName="JBossCache-Cluster"/>
+ <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="600000" nodeLockingScheme="mvcc"
+ concurrencyLevel="3000"
+ lockParentForChildInsertRemove="false"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
</jbosscache>
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RR.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RR.xml 2009-02-23 13:50:24 UTC (rev 7762)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RR.xml 2009-02-23 13:57:25 UTC (rev 7763)
@@ -1,8 +1,7 @@
<?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">
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="600000" nodeLockingScheme="mvcc" concurrencyLevel="3000"
-lockParentForChildInsertRemove="true"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
- <transport clusterName="JBossCache-Cluster"/>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="600000" nodeLockingScheme="mvcc"
+ concurrencyLevel="3000"
+ lockParentForChildInsertRemove="false"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
</jbosscache>
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-async-br.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-async-br.xml 2009-02-23 13:50:24 UTC (rev 7762)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-async-br.xml 2009-02-23 13:57:25 UTC (rev 7763)
@@ -1,46 +1,45 @@
<?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">
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"
- concurrencyLevel="1000"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
- <transport clusterName="JBossCache-Cluster">
- <jgroupsConfig>
- <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false"
- enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
- oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
- oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl"
- thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4"
- thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000"
- thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true"
- use_send_queues="false"/>
- <MPING mcast_addr="232.1.2.3" 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"/>
- <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
- <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false"
- view_ack_collection_timeout="5000" view_bundling="true"/>
- <FC max_credits="5000000" min_threshold="0.20"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <pbcast.FLUSH timeout="0"/>
- </jgroupsConfig>
- </transport>
- <replication>
- <async/>
- <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
- <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
- <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
- <properties>
- numBuddies = 1
- ignoreColocatedBuddies = true
- </properties>
- </locator>
- </buddy>
- </replication>
+ <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"
+ concurrencyLevel="3000"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <clustering mode="replication" clusterName="JBossCache-Cluster">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
+ <async serializationExecutorPoolSize="1000" serializationExecutorQueueSize="500000"/>
+ <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
+ <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
+ <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
+ <properties>
+ numBuddies = 1
+ ignoreColocatedBuddies = true
+ </properties>
+ </locator>
+ </buddy>
+ <jgroupsConfig>
+ <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false"
+ enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
+ oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
+ oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl"
+ thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4"
+ thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true"
+ use_send_queues="false"/>
+ <MPING mcast_addr="232.1.2.3" 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"/>
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
+ <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false"
+ view_ack_collection_timeout="5000" view_bundling="true"/>
+ <FC max_credits="5000000" min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
+ </clustering>
</jbosscache>
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-async.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-async.xml 2009-02-23 13:50:24 UTC (rev 7762)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-async.xml 2009-02-23 13:57:25 UTC (rev 7763)
@@ -1,39 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns="urn:jboss:jbosscache-core:config:3.0">
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"
- concurrencyLevel="1000"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
- <transport clusterName="JBossCache-Cluster">
- <jgroupsConfig>
- <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"/>
- </jgroupsConfig>
- </transport>
- <replication>
- <async useReplQueue="true" replQueueInterval="1000" replQueueMaxElements="500000"/>
- </replication>
+ <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"
+ concurrencyLevel="3000"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <clustering mode="replication" clusterName="JBossCache-Cluster">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
+ <async serializationExecutorPoolSize="1000" serializationExecutorQueueSize="500000"/>
+ <jgroupsConfig>
+ <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"/>
+ </jgroupsConfig>
+ </clustering>
</jbosscache>
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-sync-br.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-sync-br.xml 2009-02-23 13:50:24 UTC (rev 7762)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-sync-br.xml 2009-02-23 13:57:25 UTC (rev 7763)
@@ -1,46 +1,46 @@
<?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">
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"
- concurrencyLevel="1000"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
- <transport clusterName="JBossCache-Cluster">
- <jgroupsConfig>
- <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false"
- enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
- oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
- oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl"
- thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4"
- thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000"
- thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true"
- use_send_queues="false"/>
- <MPING mcast_addr="232.1.2.3" 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"/>
- <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
- <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false"
- view_ack_collection_timeout="5000" view_bundling="true"/>
- <FC max_credits="5000000" min_threshold="0.20"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <pbcast.FLUSH timeout="0"/>
- </jgroupsConfig>
- </transport>
- <replication>
- <sync replTimeout="15000"/>
- <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
- <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
- <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
- <properties>
- numBuddies = 1
- ignoreColocatedBuddies = true
- </properties>
- </locator>
- </buddy>
- </replication>
+ <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"
+ concurrencyLevel="3000"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+
+ <clustering mode="replication" clusterName="JBossCache-Cluster">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
+ <sync replTimeout="15000"/>
+ <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
+ <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
+ <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
+ <properties>
+ numBuddies = 1
+ ignoreColocatedBuddies = true
+ </properties>
+ </locator>
+ </buddy>
+ <jgroupsConfig>
+ <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false"
+ enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
+ oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
+ oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl"
+ thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4"
+ thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true"
+ use_send_queues="false"/>
+ <MPING mcast_addr="232.1.2.3" 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"/>
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
+ <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false"
+ view_ack_collection_timeout="5000" view_bundling="true"/>
+ <FC max_credits="5000000" min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
+ </clustering>
</jbosscache>
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-sync.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-sync.xml 2009-02-23 13:50:24 UTC (rev 7762)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-sync.xml 2009-02-23 13:57:25 UTC (rev 7763)
@@ -1,38 +1,40 @@
<?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">
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"
- concurrencyLevel="1000"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
- <transport clusterName="JBossCache-Cluster">
- <jgroupsConfig>
- <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"/>
- </jgroupsConfig>
- </transport>
- <replication>
- <sync replTimeout="15000"/>
- </replication>
+ <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"
+ concurrencyLevel="3000"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+
+ <clustering clusterName="JBossCache-Cluster" mode="replication">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
+ <jgroupsConfig>
+ <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"/>
+ </jgroupsConfig>
+ <sync replTimeout="15000"/>
+
+ </clustering>
+
</jbosscache>
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async-br.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async-br.xml 2009-02-23 13:50:24 UTC (rev 7762)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async-br.xml 2009-02-23 13:57:25 UTC (rev 7763)
@@ -1,45 +1,44 @@
<?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">
- <locking lockAcquisitionTimeout="10000" nodeLockingScheme="optimistic"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
- <transport clusterName="JBossCache-Cluster">
- <jgroupsConfig>
- <TCP discard_incompatible_packets="true" enable_bundling="true" enable_diagnostics="false"
- enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
- oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
- oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl"
- thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4"
- thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000"
- thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true"
- use_send_queues="false"/>
- <MPING mcast_addr="232.1.2.3" 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"/>
- <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
- <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false"
- view_ack_collection_timeout="5000" view_bundling="true"/>
- <FC max_credits="5000000" min_threshold="0.20"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <pbcast.FLUSH timeout="0"/>
- </jgroupsConfig>
- </transport>
- <replication>
- <async/>
- <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
- <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
- <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
- <properties>
- numBuddies = 1
- ignoreColocatedBuddies = true
- </properties>
- </locator>
- </buddy>
- </replication>
+ <locking lockAcquisitionTimeout="10000" nodeLockingScheme="optimistic"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <clustering clusterName="JBossCache-Cluster">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
+ <jgroupsConfig>
+ <TCP discard_incompatible_packets="true" enable_bundling="true" enable_diagnostics="false"
+ enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
+ oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
+ oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl"
+ thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4"
+ thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true"
+ use_send_queues="false"/>
+ <MPING mcast_addr="232.1.2.3" 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"/>
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
+ <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false"
+ view_ack_collection_timeout="5000" view_bundling="true"/>
+ <FC max_credits="5000000" min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
+ <async/>
+ <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
+ <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
+ <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
+ <properties>
+ numBuddies = 1
+ ignoreColocatedBuddies = true
+ </properties>
+ </locator>
+ </buddy>
+ </clustering>
</jbosscache>
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async.xml 2009-02-23 13:50:24 UTC (rev 7762)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async.xml 2009-02-23 13:57:25 UTC (rev 7763)
@@ -1,37 +1,36 @@
<?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">
- <locking lockAcquisitionTimeout="10000" nodeLockingScheme="optimistic"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
- <transport clusterName="JBossCache-Cluster">
- <jgroupsConfig>
- <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="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"/>
- </jgroupsConfig>
- </transport>
- <replication>
- <async/>
- </replication>
+ <locking lockAcquisitionTimeout="10000" nodeLockingScheme="optimistic"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <clustering clusterName="JBossCache-Cluster">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
+ <jgroupsConfig>
+ <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="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"/>
+ </jgroupsConfig>
+ <async/>
+ </clustering>
</jbosscache>
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync-br.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync-br.xml 2009-02-23 13:50:24 UTC (rev 7762)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync-br.xml 2009-02-23 13:57:25 UTC (rev 7763)
@@ -1,45 +1,44 @@
<?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">
- <locking lockAcquisitionTimeout="10000" nodeLockingScheme="optimistic"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
- <transport clusterName="JBossCache-Cluster">
- <jgroupsConfig>
- <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false"
- enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
- oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
- oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl"
- thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4"
- thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000"
- thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true"
- use_send_queues="false"/>
- <MPING mcast_addr="232.1.2.3" 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"/>
- <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
- <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false"
- view_ack_collection_timeout="5000" view_bundling="true"/>
- <FC max_credits="5000000" min_threshold="0.20"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <pbcast.FLUSH timeout="0"/>
- </jgroupsConfig>
- </transport>
- <replication>
- <sync replTimeout="15000"/>
- <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
- <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
- <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
- <properties>
- numBuddies = 1
- ignoreColocatedBuddies = true
- </properties>
- </locator>
- </buddy>
- </replication>
+ <locking lockAcquisitionTimeout="10000" nodeLockingScheme="optimistic"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <clustering clusterName="JBossCache-Cluster">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
+ <jgroupsConfig>
+ <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false"
+ enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
+ oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
+ oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl"
+ thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4"
+ thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true"
+ use_send_queues="false"/>
+ <MPING mcast_addr="232.1.2.3" 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"/>
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
+ <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false"
+ view_ack_collection_timeout="5000" view_bundling="true"/>
+ <FC max_credits="5000000" min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
+ <sync replTimeout="15000"/>
+ <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
+ <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
+ <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
+ <properties>
+ numBuddies = 1
+ ignoreColocatedBuddies = true
+ </properties>
+ </locator>
+ </buddy>
+ </clustering>
</jbosscache>
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync.xml 2009-02-23 13:50:24 UTC (rev 7762)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync.xml 2009-02-23 13:57:25 UTC (rev 7763)
@@ -1,37 +1,36 @@
<?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">
- <locking lockAcquisitionTimeout="10000" nodeLockingScheme="optimistic"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
- <transport clusterName="JBossCache-Cluster">
- <jgroupsConfig>
- <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"/>
- </jgroupsConfig>
- </transport>
- <replication>
- <sync replTimeout="15000"/>
- </replication>
+ <locking lockAcquisitionTimeout="10000" nodeLockingScheme="optimistic"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <clustering clusterName="JBossCache-Cluster">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
+ <jgroupsConfig>
+ <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"/>
+ </jgroupsConfig>
+ <sync replTimeout="15000"/>
+ </clustering>
</jbosscache>
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local-NONE.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local-NONE.xml 2009-02-23 13:50:24 UTC (rev 7762)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local-NONE.xml 2009-02-23 13:57:25 UTC (rev 7763)
@@ -1,7 +1,8 @@
<?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">
- <locking isolationLevel="NONE" lockAcquisitionTimeout="10000" nodeLockingScheme="pessimistic"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
- <transport clusterName="JBossCache-Cluster"/>
+ <locking isolationLevel="NONE" lockAcquisitionTimeout="10000" nodeLockingScheme="pessimistic"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <clustering>
+ <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
+ </clustering>
</jbosscache>
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local.xml 2009-02-23 13:50:24 UTC (rev 7762)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local.xml 2009-02-23 13:57:25 UTC (rev 7763)
@@ -2,6 +2,4 @@
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="pessimistic"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
- <transport clusterName="JBossCache-Cluster"/>
</jbosscache>
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async-br.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async-br.xml 2009-02-23 13:50:24 UTC (rev 7762)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async-br.xml 2009-02-23 13:57:25 UTC (rev 7763)
@@ -1,45 +1,44 @@
<?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">
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="pessimistic"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
- <transport clusterName="JBossCache-Cluster">
- <jgroupsConfig>
- <TCP discard_incompatible_packets="true" enable_bundling="true" enable_diagnostics="false"
- enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
- oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
- oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl"
- thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4"
- thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000"
- thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true"
- use_send_queues="false"/>
- <MPING mcast_addr="232.1.2.3" 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"/>
- <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
- <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false"
- view_ack_collection_timeout="5000" view_bundling="true"/>
- <FC max_credits="5000000" min_threshold="0.20"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <pbcast.FLUSH timeout="0"/>
- </jgroupsConfig>
- </transport>
- <replication>
- <async/>
- <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
- <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
- <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
- <properties>
- numBuddies = 1
- ignoreColocatedBuddies = true
- </properties>
- </locator>
- </buddy>
- </replication>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="pessimistic"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <clustering clusterName="JBossCache-Cluster">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
+ <jgroupsConfig>
+ <TCP discard_incompatible_packets="true" enable_bundling="true" enable_diagnostics="false"
+ enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
+ oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
+ oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl"
+ thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4"
+ thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true"
+ use_send_queues="false"/>
+ <MPING mcast_addr="232.1.2.3" 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"/>
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
+ <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false"
+ view_ack_collection_timeout="5000" view_bundling="true"/>
+ <FC max_credits="5000000" min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
+ <async/>
+ <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
+ <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
+ <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
+ <properties>
+ numBuddies = 1
+ ignoreColocatedBuddies = true
+ </properties>
+ </locator>
+ </buddy>
+ </clustering>
</jbosscache>
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async.xml 2009-02-23 13:50:24 UTC (rev 7762)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async.xml 2009-02-23 13:57:25 UTC (rev 7763)
@@ -1,37 +1,36 @@
<?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">
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="pessimistic"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
- <transport clusterName="JBossCache-Cluster">
- <jgroupsConfig>
- <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="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"/>
- </jgroupsConfig>
- </transport>
- <replication>
- <async/>
- </replication>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="pessimistic"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <clustering clusterName="JBossCache-Cluster">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
+ <jgroupsConfig>
+ <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="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"/>
+ </jgroupsConfig>
+ <async/>
+ </clustering>
</jbosscache>
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync-br.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync-br.xml 2009-02-23 13:50:24 UTC (rev 7762)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync-br.xml 2009-02-23 13:57:25 UTC (rev 7763)
@@ -1,45 +1,44 @@
<?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">
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="pessimistic"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
- <transport clusterName="JBossCache-Cluster">
- <jgroupsConfig>
- <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false"
- enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
- oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
- oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl"
- thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4"
- thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000"
- thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true"
- use_send_queues="false"/>
- <MPING mcast_addr="232.1.2.3" 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"/>
- <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
- <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false"
- view_ack_collection_timeout="5000" view_bundling="true"/>
- <FC max_credits="5000000" min_threshold="0.20"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <pbcast.FLUSH timeout="0"/>
- </jgroupsConfig>
- </transport>
- <replication>
- <sync replTimeout="15000"/>
- <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
- <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
- <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
- <properties>
- numBuddies = 1
- ignoreColocatedBuddies = true
- </properties>
- </locator>
- </buddy>
- </replication>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="pessimistic"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <clustering clusterName="JBossCache-Cluster">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
+ <jgroupsConfig>
+ <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false"
+ enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
+ oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
+ oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl"
+ thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4"
+ thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true"
+ use_send_queues="false"/>
+ <MPING mcast_addr="232.1.2.3" 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"/>
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
+ <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false"
+ view_ack_collection_timeout="5000" view_bundling="true"/>
+ <FC max_credits="5000000" min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
+ <sync replTimeout="15000"/>
+ <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
+ <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
+ <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
+ <properties>
+ numBuddies = 1
+ ignoreColocatedBuddies = true
+ </properties>
+ </locator>
+ </buddy>
+ </clustering>
</jbosscache>
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync.xml 2009-02-23 13:50:24 UTC (rev 7762)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync.xml 2009-02-23 13:57:25 UTC (rev 7763)
@@ -1,37 +1,36 @@
<?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">
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="pessimistic"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
- <transport clusterName="JBossCache-Cluster">
- <jgroupsConfig>
- <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"/>
- </jgroupsConfig>
- </transport>
- <replication>
- <sync replTimeout="15000"/>
- </replication>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="pessimistic"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <clustering clusterName="JBossCache-Cluster">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
+ <jgroupsConfig>
+ <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"/>
+ </jgroupsConfig>
+ <sync replTimeout="15000"/>
+ </clustering>
</jbosscache>
14 years
JBoss Cache SVN: r7762 - benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib.
by jbosscache-commits@lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-02-23 08:50:24 -0500 (Mon, 23 Feb 2009)
New Revision: 7762
Modified:
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jbosscache-core.jar
Log:
Updated to 3.0.3.GA
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jbosscache-core.jar
===================================================================
(Binary files differ)
14 years
JBoss Cache SVN: r7761 - benchmarks/benchmark-fwk/trunk/cache-products/whirlycache-1.0.1/src/org/cachebench/cachewrappers.
by jbosscache-commits@lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-02-23 08:50:05 -0500 (Mon, 23 Feb 2009)
New Revision: 7761
Modified:
benchmarks/benchmark-fwk/trunk/cache-products/whirlycache-1.0.1/src/org/cachebench/cachewrappers/WhirlyCacheTest.java
benchmarks/benchmark-fwk/trunk/cache-products/whirlycache-1.0.1/src/org/cachebench/cachewrappers/WhirlyCacheWrapper.java
Log:
Updated whirlycache wrapper
Modified: benchmarks/benchmark-fwk/trunk/cache-products/whirlycache-1.0.1/src/org/cachebench/cachewrappers/WhirlyCacheTest.java
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/whirlycache-1.0.1/src/org/cachebench/cachewrappers/WhirlyCacheTest.java 2009-02-23 13:01:39 UTC (rev 7760)
+++ benchmarks/benchmark-fwk/trunk/cache-products/whirlycache-1.0.1/src/org/cachebench/cachewrappers/WhirlyCacheTest.java 2009-02-23 13:50:05 UTC (rev 7761)
@@ -4,23 +4,20 @@
public class WhirlyCacheTest
{
-
public static void main(String[] args) throws Exception
{
-
-
CacheWrapper w = new WhirlyCacheWrapper();
w.init(null);
- w.setUp();
String k = "k", v = "v";
-
w.put(null, k, v);
-
System.out.println("Value is " + w.get(null, k));
-
w.empty();
-
System.out.println("Value is " + w.get(null, k));
-
+ w.tearDown();
+ w.init(null);
+ w.put(null, k, v);
+ System.out.println("Value is " + w.get(null, k));
+ w.empty();
+ System.out.println("Value is " + w.get(null, k));
}
}
\ No newline at end of file
Modified: benchmarks/benchmark-fwk/trunk/cache-products/whirlycache-1.0.1/src/org/cachebench/cachewrappers/WhirlyCacheWrapper.java
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/whirlycache-1.0.1/src/org/cachebench/cachewrappers/WhirlyCacheWrapper.java 2009-02-23 13:01:39 UTC (rev 7760)
+++ benchmarks/benchmark-fwk/trunk/cache-products/whirlycache-1.0.1/src/org/cachebench/cachewrappers/WhirlyCacheWrapper.java 2009-02-23 13:50:05 UTC (rev 7761)
@@ -37,7 +37,7 @@
*/
public void tearDown() throws Exception
{
- CacheManager.getInstance().destroy();
+ empty();
}
public void empty() throws Exception
14 years
JBoss Cache SVN: r7760 - in core/tags/3.0.3.GA: src/main/java/org/jboss/cache and 1 other directory.
by jbosscache-commits@lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-02-23 08:01:39 -0500 (Mon, 23 Feb 2009)
New Revision: 7760
Modified:
core/tags/3.0.3.GA/pom.xml
core/tags/3.0.3.GA/src/main/java/org/jboss/cache/Version.java
Log:
JBoss Cache Release Script: Updating 3.0.3.GA
Modified: core/tags/3.0.3.GA/pom.xml
===================================================================
--- core/tags/3.0.3.GA/pom.xml 2009-02-23 13:00:47 UTC (rev 7759)
+++ core/tags/3.0.3.GA/pom.xml 2009-02-23 13:01:39 UTC (rev 7760)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
- <jbosscache-core-version>3.0.4-SNAPSHOT</jbosscache-core-version>
+ <jbosscache-core-version>3.0.3.GA</jbosscache-core-version>
<!-- By default only run tests in the "unit" group -->
<defaultTestGroup>unit</defaultTestGroup>
<!-- By default only generate Javadocs when we install the module. -->
@@ -467,7 +467,7 @@
<activeByDefault>false</activeByDefault>
</activation>
<properties>
- <jbosscache-core-version>3.0.3-SNAPSHOT-JBossAS</jbosscache-core-version>
+ <jbosscache-core-version>3.0.3.GA-JBossAS</jbosscache-core-version>
<defaultTestGroup>functional,unit</defaultTestGroup>
<protocol.stack>tcp</protocol.stack>
</properties>
Modified: core/tags/3.0.3.GA/src/main/java/org/jboss/cache/Version.java
===================================================================
--- core/tags/3.0.3.GA/src/main/java/org/jboss/cache/Version.java 2009-02-23 13:00:47 UTC (rev 7759)
+++ core/tags/3.0.3.GA/src/main/java/org/jboss/cache/Version.java 2009-02-23 13:01:39 UTC (rev 7760)
@@ -31,10 +31,10 @@
*/
@Immutable
public class Version {
- public static final String version = "3.0.4-SNAPSHOT";
+ public static final String version = "3.0.3.GA";
public static final String codename = "Naga";
//public static final String cvs = "$Id$";
- static final byte[] version_id = {'0', '3', '0', '4', 'S'};
+ static final byte[] version_id = {'0','3','0','3','G','A'};
private static final int MAJOR_SHIFT = 11;
private static final int MINOR_SHIFT = 6;
14 years
JBoss Cache SVN: r7759 - core/tags.
by jbosscache-commits@lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-02-23 08:00:47 -0500 (Mon, 23 Feb 2009)
New Revision: 7759
Added:
core/tags/3.0.3.GA/
Log:
JBoss Cache Release Script: Tagging 3.0.3.GA
Copied: core/tags/3.0.3.GA (from rev 7758, core/branches/3.0.X)
14 years
JBoss Cache SVN: r7758 - core/branches/3.0.X.
by jbosscache-commits@lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-02-23 07:59:56 -0500 (Mon, 23 Feb 2009)
New Revision: 7758
Modified:
core/branches/3.0.X/release.sh
Log:
Make sure we release from branch and not trunk
Modified: core/branches/3.0.X/release.sh
===================================================================
--- core/branches/3.0.X/release.sh 2009-02-23 12:59:02 UTC (rev 7757)
+++ core/branches/3.0.X/release.sh 2009-02-23 12:59:56 UTC (rev 7758)
@@ -56,7 +56,7 @@
tag()
{
- svn cp ${svnBase}/trunk ${svnBase}/${svnTags}/$ver -m "JBoss Cache Release Script: Tagging $ver"
+ svn cp ${svnBase}/branches/3.0.X ${svnBase}/${svnTags}/$ver -m "JBoss Cache Release Script: Tagging $ver"
cd $localTagsDir
svn co ${svnBase}/${svnTags}/$ver
cd $ver
14 years
JBoss Cache SVN: r7757 - core/tags.
by jbosscache-commits@lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-02-23 07:59:02 -0500 (Mon, 23 Feb 2009)
New Revision: 7757
Removed:
core/tags/3.0.3.GA/
Log:
14 years
JBoss Cache SVN: r7756 - core/branches/3.0.X/src/main/java/org/jboss/cache.
by jbosscache-commits@lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-02-23 07:58:42 -0500 (Mon, 23 Feb 2009)
New Revision: 7756
Modified:
core/branches/3.0.X/src/main/java/org/jboss/cache/DefaultCacheFactory.java
Log:
Parser log messages
Modified: core/branches/3.0.X/src/main/java/org/jboss/cache/DefaultCacheFactory.java
===================================================================
--- core/branches/3.0.X/src/main/java/org/jboss/cache/DefaultCacheFactory.java 2009-02-23 12:38:59 UTC (rev 7755)
+++ core/branches/3.0.X/src/main/java/org/jboss/cache/DefaultCacheFactory.java 2009-02-23 12:58:42 UTC (rev 7756)
@@ -82,8 +82,12 @@
log.trace("Had problems parsing configuration file.", e);
log.trace("Attempting to use a legacy parser.");
}
- XmlConfigurationParser2x oldParser = new XmlConfigurationParser2x();
- c = oldParser.parseFile(configFileName);
+ try {
+ XmlConfigurationParser2x oldParser = new XmlConfigurationParser2x();
+ c = oldParser.parseFile(configFileName);
+ } catch (Exception e2) {
+ throw e;
+ }
if (c != null && log.isInfoEnabled())
log.info("Detected legacy configuration file format when parsing configuration file. Migrating to the new (3.x) file format is recommended. See FAQs for details.");
}
@@ -165,8 +169,12 @@
log.trace("Had problems parsing configuration file.", e);
log.trace("Attempting to use a legacy parser.");
}
- XmlConfigurationParser2x oldParser = new XmlConfigurationParser2x();
- c = oldParser.parseStream(is);
+ try {
+ XmlConfigurationParser2x oldParser = new XmlConfigurationParser2x();
+ c = oldParser.parseStream(is);
+ } catch (Exception e2) {
+ throw e;
+ }
if (c != null && log.isInfoEnabled())
log.info("Detected legacy configuration file format when parsing configuration file. Migrating to the new (3.x) file format is recommended. See FAQs for details.");
}
14 years
JBoss Cache SVN: r7755 - core/tags/3.0.3.GA/src/main/java/org/jboss/cache.
by jbosscache-commits@lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-02-23 07:38:59 -0500 (Mon, 23 Feb 2009)
New Revision: 7755
Modified:
core/tags/3.0.3.GA/src/main/java/org/jboss/cache/DefaultCacheFactory.java
Log:
Log messages
Modified: core/tags/3.0.3.GA/src/main/java/org/jboss/cache/DefaultCacheFactory.java
===================================================================
--- core/tags/3.0.3.GA/src/main/java/org/jboss/cache/DefaultCacheFactory.java 2009-02-23 12:38:05 UTC (rev 7754)
+++ core/tags/3.0.3.GA/src/main/java/org/jboss/cache/DefaultCacheFactory.java 2009-02-23 12:38:59 UTC (rev 7755)
@@ -24,7 +24,6 @@
import org.jboss.cache.annotations.Compat;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.ConfigurationException;
-import org.jboss.cache.config.LegacyConfigurationException;
import org.jboss.cache.config.parsing.XmlConfigurationParser;
import org.jboss.cache.config.parsing.XmlConfigurationParser2x;
import org.jboss.cache.factories.ComponentFactory;
@@ -37,15 +36,14 @@
/**
* Default implementation of the {@link org.jboss.cache.CacheFactory} interface.
* <p/>
- * This is a special instance of a {@link ComponentFactory} which contains bootstrap information for the
- * {@link org.jboss.cache.factories.ComponentRegistry}.
+ * This is a special instance of a {@link ComponentFactory} which contains bootstrap information for the {@link
+ * org.jboss.cache.factories.ComponentRegistry}.
* <p/>
*
* @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
* @see org.jboss.cache.factories.ComponentFactory
*/
-public class DefaultCacheFactory<K, V> extends ComponentFactory implements CacheFactory<K, V>
-{
+public class DefaultCacheFactory<K, V> extends ComponentFactory implements CacheFactory<K, V> {
private ClassLoader defaultClassLoader;
@@ -57,38 +55,37 @@
@SuppressWarnings("unchecked")
@Deprecated
@Compat
- public static CacheFactory getInstance()
- {
+ public static CacheFactory getInstance() {
return new DefaultCacheFactory();
}
- public Cache<K, V> createCache() throws ConfigurationException
- {
+ public Cache<K, V> createCache() throws ConfigurationException {
return createCache(true);
}
- public Cache<K, V> createCache(boolean start) throws ConfigurationException
- {
+ public Cache<K, V> createCache(boolean start) throws ConfigurationException {
return createCache(new Configuration(), start);
}
- public Cache<K, V> createCache(String configFileName) throws ConfigurationException
- {
+ public Cache<K, V> createCache(String configFileName) throws ConfigurationException {
return createCache(configFileName, true);
}
- public Cache<K, V> createCache(String configFileName, boolean start) throws ConfigurationException
- {
+ public Cache<K, V> createCache(String configFileName, boolean start) throws ConfigurationException {
XmlConfigurationParser parser = new XmlConfigurationParser();
Configuration c;
- try
- {
+ try {
c = parser.parseFile(configFileName);
}
- catch (ConfigurationException e)
- {
+ catch (ConfigurationException e) {
+ if (log.isTraceEnabled()) {
+ log.trace("Had problems parsing configuration file.", e);
+ log.trace("Attempting to use a legacy parser.");
+ }
XmlConfigurationParser2x oldParser = new XmlConfigurationParser2x();
c = oldParser.parseFile(configFileName);
+ if (c != null && log.isInfoEnabled())
+ log.info("Detected legacy configuration file format when parsing configuration file. Migrating to the new (3.x) file format is recommended. See FAQs for details.");
}
return createCache(c, start);
}
@@ -100,8 +97,7 @@
* @return a cache
* @throws ConfigurationException if there are problems with the cfg
*/
- public Cache<K, V> createCache(Configuration configuration) throws ConfigurationException
- {
+ public Cache<K, V> createCache(Configuration configuration) throws ConfigurationException {
return createCache(configuration, true);
}
@@ -113,30 +109,24 @@
* @return a cache
* @throws ConfigurationException if there are problems with the cfg
*/
- public Cache<K, V> createCache(Configuration configuration, boolean start) throws ConfigurationException
- {
- try
- {
+ public Cache<K, V> createCache(Configuration configuration, boolean start) throws ConfigurationException {
+ try {
CacheSPI<K, V> cache = createAndWire(configuration);
if (start) cache.start();
return cache;
}
- catch (ConfigurationException ce)
- {
+ catch (ConfigurationException ce) {
throw ce;
}
- catch (RuntimeException re)
- {
+ catch (RuntimeException re) {
throw re;
}
- catch (Exception e)
- {
+ catch (Exception e) {
throw new RuntimeException(e);
}
}
- protected CacheSPI<K, V> createAndWire(Configuration configuration) throws Exception
- {
+ protected CacheSPI<K, V> createAndWire(Configuration configuration) throws Exception {
CacheSPI<K, V> spi = new CacheInvocationDelegate<K, V>();
bootstrap(spi, configuration);
return spi;
@@ -145,8 +135,7 @@
/**
* Bootstraps this factory with a Configuration and a ComponentRegistry.
*/
- private void bootstrap(CacheSPI spi, Configuration configuration)
- {
+ private void bootstrap(CacheSPI spi, Configuration configuration) {
// injection bootstrap stuff
componentRegistry = new ComponentRegistry(configuration, spi);
componentRegistry.registerDefaultClassLoader(defaultClassLoader);
@@ -161,21 +150,21 @@
*
* @param loader class loader to use as a default.
*/
- public void setDefaultClassLoader(ClassLoader loader)
- {
+ public void setDefaultClassLoader(ClassLoader loader) {
this.defaultClassLoader = loader;
}
- public Cache<K, V> createCache(InputStream is) throws ConfigurationException
- {
+ public Cache<K, V> createCache(InputStream is) throws ConfigurationException {
XmlConfigurationParser parser = new XmlConfigurationParser();
Configuration c = null;
- try
- {
+ try {
c = parser.parseStream(is);
}
- catch (ConfigurationException e)
- {
+ catch (ConfigurationException e) {
+ if (log.isTraceEnabled()) {
+ log.trace("Had problems parsing configuration file.", e);
+ log.trace("Attempting to use a legacy parser.");
+ }
XmlConfigurationParser2x oldParser = new XmlConfigurationParser2x();
c = oldParser.parseStream(is);
if (c != null && log.isInfoEnabled())
@@ -184,16 +173,14 @@
return createCache(c);
}
- public Cache<K, V> createCache(InputStream is, boolean start) throws ConfigurationException
- {
+ public Cache<K, V> createCache(InputStream is, boolean start) throws ConfigurationException {
XmlConfigurationParser parser = new XmlConfigurationParser();
Configuration c = parser.parseStream(is);
return createCache(c, start);
}
@Override
- protected <T> T construct(Class<T> componentType)
- {
+ protected <T> T construct(Class<T> componentType) {
throw new UnsupportedOperationException("Should never be invoked - this is a bootstrap factory.");
}
}
14 years