JBoss Cache SVN: r6303 - benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/cachebench/cachewrappers.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-07-16 09:57:30 -0400 (Wed, 16 Jul 2008)
New Revision: 6303
Modified:
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/cachebench/cachewrappers/JBossCache300Wrapper.java
Log:
Null check
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/cachebench/cachewrappers/JBossCache300Wrapper.java
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/cachebench/cachewrappers/JBossCache300Wrapper.java 2008-07-16 13:53:25 UTC (rev 6302)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/cachebench/cachewrappers/JBossCache300Wrapper.java 2008-07-16 13:57:30 UTC (rev 6303)
@@ -1,15 +1,12 @@
package org.cachebench.cachewrappers;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.cachebench.CacheWrapper;
import org.jboss.cache.Cache;
import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
-import org.jboss.cache.CacheSPI;
import org.jboss.cache.config.Option;
-import org.jboss.cache.marshall.NodeData;
-import org.jboss.cache.buddyreplication.GravitateResult;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.cachebench.CacheWrapper;
import java.util.Map;
@@ -24,7 +21,7 @@
public void init(Map parameters) throws Exception
{
log.info("Creating cache with the following configuration: " + parameters);
- cache = new DefaultCacheFactory().createCache((String)parameters.get("config"));
+ cache = new DefaultCacheFactory().createCache((String) parameters.get("config"));
log.info("Running cache with following config: " + cache.getConfiguration());
log.info("Running follwing JBossCacheVersion: " + org.jboss.cache.Version.version);
log.info("Running follwing JBossCacheCodeName: " + org.jboss.cache.Version.codename);
@@ -60,7 +57,7 @@
public int getNumMembers()
{
- return cache.getMembers().size();
+ return cache.getMembers() == null ? 0 : cache.getMembers().size();
}
public String getInfo()
17 years, 5 months
JBoss Cache SVN: r6302 - benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-07-16 09:53:25 -0400 (Wed, 16 Jul 2008)
New Revision: 6302
Added:
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local-NONE.xml
Log:
Added some MVCC and pess. locking cfgs
Copied: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local.xml (from rev 6297, 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/mvcc-local.xml (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local.xml 2008-07-16 13:53:25 UTC (rev 6302)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <stateRetrieval timeout="20000"/>
+ <transport clusterName="JBossCache-Cluster"/>
+</jbosscache>
Copied: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local-NONE.xml (from rev 6297, 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-NONE.xml (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local-NONE.xml 2008-07-16 13:53:25 UTC (rev 6302)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
+ <locking isolationLevel="NONE" lockAcquisitionTimeout="10000" nodeLockingScheme="pessimistic"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <stateRetrieval timeout="20000"/>
+ <transport clusterName="JBossCache-Cluster"/>
+</jbosscache>
17 years, 5 months
JBoss Cache SVN: r6301 - in benchmarks/benchmark-fwk/trunk/src/org/cachebench: tests/simpletests and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-07-16 09:40:26 -0400 (Wed, 16 Jul 2008)
New Revision: 6301
Modified:
benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/PutGetChartGenerator.java
benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/SimpleTest.java
Log:
Measures in Nanos now
Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/PutGetChartGenerator.java
===================================================================
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/PutGetChartGenerator.java 2008-07-16 13:39:53 UTC (rev 6300)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/PutGetChartGenerator.java 2008-07-16 13:40:26 UTC (rev 6301)
@@ -28,28 +28,29 @@
public class PutGetChartGenerator extends AbstractChartGen
{
private DefaultCategoryDataset putData, getData;
- private String putChartName = "PutChart.png", getChartName = "GetChart.png";
+ private String chartExtension = ".png";
+ private String putChartName = "PutChart", getChartName = "GetChart";
public void generateChart() throws IOException
{
readData();
String putChartNameToUse = filenamePrefix == null ? putChartName : filenamePrefix + "-" + putChartName;
- File chartFile = new File(putChartNameToUse);
+ File chartFile = new File(putChartNameToUse + chartExtension);
if (chartFile.exists())
{
- chartFile.renameTo(new File(putChartNameToUse + "." + System.currentTimeMillis()));
- chartFile = new File(putChartNameToUse);
+ chartFile.renameTo(new File(putChartNameToUse + "." + System.currentTimeMillis() + chartExtension));
+ chartFile = new File(putChartNameToUse + chartExtension);
}
ChartUtilities.saveChartAsPNG(chartFile, createChart("Report: Comparing Cache PUT (WRITE) performance", putData), 800, 800);
String getChartNameToUse = filenamePrefix == null ? getChartName : filenamePrefix + "-" + getChartName;
- chartFile = new File(getChartNameToUse);
+ chartFile = new File(getChartNameToUse + chartExtension);
if (chartFile.exists())
{
- chartFile.renameTo(new File(getChartNameToUse + "." + System.currentTimeMillis()));
- chartFile = new File(getChartNameToUse);
+ chartFile.renameTo(new File(getChartNameToUse + "." + System.currentTimeMillis() + chartExtension));
+ chartFile = new File(getChartNameToUse + chartExtension);
}
ChartUtilities.saveChartAsPNG(chartFile, createChart("Report: Comparing Cache GET (READ) performance", getData), 800, 800);
@@ -177,8 +178,8 @@
double[] results = new double[2];
try
{
- results[0] = Double.parseDouble(putStr) * 1000;
- results[1] = Double.parseDouble(getStr) * 1000;
+ results[0] = Double.parseDouble(putStr) / 1000;
+ results[1] = Double.parseDouble(getStr) / 1000;
return results;
}
catch (NumberFormatException nfe)
Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/SimpleTest.java
===================================================================
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/SimpleTest.java 2008-07-16 13:39:53 UTC (rev 6300)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/SimpleTest.java 2008-07-16 13:40:26 UTC (rev 6301)
@@ -5,23 +5,21 @@
import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
import org.cachebench.CacheWrapper;
import org.cachebench.SerializableCacheWrapper;
+import org.cachebench.config.Configuration;
+import org.cachebench.tests.CacheTest;
import org.cachebench.tests.results.StatisticTestResult;
-import org.cachebench.tests.CacheTest;
-import org.cachebench.config.Configuration;
-import java.io.Serializable;
import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
+import java.io.Serializable;
import java.util.Date;
+import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicLong;
/**
- *
- *
* @author Manik Surtani (manik(a)surtani.org)
* (C) Manik Surtani, 2004
*/
@@ -83,7 +81,6 @@
result.setThroughputBytesPerSecond(-999);
}
-
// set the number of members in the cluster
result.setNumMembers(cache.getNumMembers());
result.setNumThreads(numThreads);
@@ -115,18 +112,18 @@
if (!useSerializable)
{
// start your timer...
- long startTime = System.currentTimeMillis();
+ long startTime = System.nanoTime();
cache.get(key + cycleNumber);
- long statValue = (System.currentTimeMillis() - startTime);
+ long statValue = (System.nanoTime() - startTime);
stats.addValue(statValue);
log.debug("The Get stat : " + statValue);
}
else
{
SerializableCacheWrapper sCache = (SerializableCacheWrapper) cache;
- long startTime = System.currentTimeMillis();
+ long startTime = System.nanoTime();
sCache.getSerializable(key + cycleNumber);
- long statValue = (System.currentTimeMillis() - startTime);
+ long statValue = (System.nanoTime() - startTime);
stats.addValue(statValue);
log.debug("The Get stat : " + statValue);
}
@@ -174,7 +171,7 @@
final boolean useSerializable = cache instanceof SerializableCacheWrapper;
numberOfBytesPut.set(0);
elapsedSecondsForAllPuts = 0;
- long startElapsedTime = System.currentTimeMillis();
+ long startElapsedTime = System.nanoTime();
for (int i = 0; i < sampleSize; i++)
{
@@ -200,21 +197,21 @@
if (!useSerializable)
{
// start your timer...
- long startTime = System.currentTimeMillis();
+ long startTime = System.nanoTime();
cache.put(key + cycleNumber, value);
- long statValue = (System.currentTimeMillis() - startTime);
+ long statValue = (System.nanoTime() - startTime);
stats.addValue(statValue);
}
else
{
SerializableCacheWrapper sCache = (SerializableCacheWrapper) cache;
Serializable sValue = (Serializable) value;
- long startTime = System.currentTimeMillis();
+ long startTime = System.nanoTime();
sCache.putSerializable(key + cycleNumber, sValue);
- long statValue = (System.currentTimeMillis() - startTime);
+ long statValue = (System.nanoTime() - startTime);
stats.addValue(statValue);
}
- logOperation(cycleNumber,"PUTS");
+ logOperation(cycleNumber, "PUTS");
}
catch (Exception e)
{
@@ -229,8 +226,9 @@
// only leave once the task queue is empty!!
blockTillTasksComplete();
- elapsedSecondsForAllPuts = (System.currentTimeMillis() - startElapsedTime) / 1000;
+ elapsedSecondsForAllPuts = TimeUnit.NANOSECONDS.toSeconds(System.nanoTime() - startElapsedTime);
+
// return the raw data
log.debug("Leaving doPuts for " + cache);
return stats;
@@ -287,7 +285,9 @@
try
{
return " - " + Integer.parseInt(System.getProperty("currentIndex"));
- } catch (Exception e) {
+ }
+ catch (Exception e)
+ {
return "";
}
}
17 years, 5 months
JBoss Cache SVN: r6300 - benchmarks/benchmark-fwk/trunk.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-07-16 09:39:53 -0400 (Wed, 16 Jul 2008)
New Revision: 6300
Modified:
benchmarks/benchmark-fwk/trunk/runAllLocal.sh
Log:
Updated to 3.0.0
Modified: benchmarks/benchmark-fwk/trunk/runAllLocal.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/runAllLocal.sh 2008-07-16 13:16:42 UTC (rev 6299)
+++ benchmarks/benchmark-fwk/trunk/runAllLocal.sh 2008-07-16 13:39:53 UTC (rev 6300)
@@ -1,12 +1,12 @@
#!/bin/bash
-./runLocalNode.sh jbosscache-2.2.0 pess-local.xml
-./runLocalNode.sh jbosscache-2.2.0 mvcc-local.xml
-./runLocalNode.sh jbosscache-2.2.0 pess-local-NONE.xml
+./runLocalNode.sh jbosscache-3.0.0 pess-local.xml
+./runLocalNode.sh jbosscache-3.0.0 mvcc-local.xml
+./runLocalNode.sh jbosscache-3.0.0 pess-local-NONE.xml
./runLocalNode.sh ehcache-1.4.1 ehcache-local.xml
mkdir output
mv data* ./output
-./generateChart.sh -reportDir output -o 28MAY -chartType putget
+./generateChart.sh -reportDir output -o MVCC -chartType putget
17 years, 5 months
JBoss Cache SVN: r6299 - benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-07-16 09:16:42 -0400 (Wed, 16 Jul 2008)
New Revision: 6299
Added:
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
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.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.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:
added mvcc support files
Added: 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 (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-async-br.xml 2008-07-16 13:16:42 UTC (rev 6299)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <stateRetrieval timeout="20000"/>
+ <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>
+</jbosscache>
Added: 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 (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-async.xml 2008-07-16 13:16:42 UTC (rev 6299)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <stateRetrieval timeout="20000"/>
+ <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>
+ <async/>
+ </replication>
+</jbosscache>
Added: 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 (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-sync-br.xml 2008-07-16 13:16:42 UTC (rev 6299)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <stateRetrieval timeout="20000"/>
+ <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>
+</jbosscache>
Added: 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 (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-sync.xml 2008-07-16 13:16:42 UTC (rev 6299)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <stateRetrieval timeout="20000"/>
+ <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>
+</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 2008-07-16 13:13:16 UTC (rev 6298)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async-br.xml 2008-07-16 13:16:42 UTC (rev 6299)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache>
- <locking lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
+ <locking lockAcquisitionTimeout="10000" nodeLockingScheme="optimistic"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster">
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 2008-07-16 13:13:16 UTC (rev 6298)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async.xml 2008-07-16 13:16:42 UTC (rev 6299)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache>
- <locking lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
+ <locking lockAcquisitionTimeout="10000" nodeLockingScheme="optimistic"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster">
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 2008-07-16 13:13:16 UTC (rev 6298)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync-br.xml 2008-07-16 13:16:42 UTC (rev 6299)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache>
- <locking lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
+ <locking lockAcquisitionTimeout="10000" nodeLockingScheme="optimistic"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster">
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 2008-07-16 13:13:16 UTC (rev 6298)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync.xml 2008-07-16 13:16:42 UTC (rev 6299)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache>
- <locking lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
+ <locking lockAcquisitionTimeout="10000" nodeLockingScheme="optimistic"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster">
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 2008-07-16 13:13:16 UTC (rev 6298)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local.xml 2008-07-16 13:16:42 UTC (rev 6299)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache>
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="pessimistic"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster"/>
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 2008-07-16 13:13:16 UTC (rev 6298)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async-br.xml 2008-07-16 13:16:42 UTC (rev 6299)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache>
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="pessimistic"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster">
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 2008-07-16 13:13:16 UTC (rev 6298)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async.xml 2008-07-16 13:16:42 UTC (rev 6299)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache>
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="pessimistic"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster">
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 2008-07-16 13:13:16 UTC (rev 6298)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync-br.xml 2008-07-16 13:16:42 UTC (rev 6299)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache>
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="pessimistic"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster">
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 2008-07-16 13:13:16 UTC (rev 6298)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync.xml 2008-07-16 13:16:42 UTC (rev 6299)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache>
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="pessimistic"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster">
17 years, 5 months
JBoss Cache SVN: r6298 - in benchmarks/benchmark-fwk/trunk: conf and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-07-16 09:13:16 -0400 (Wed, 16 Jul 2008)
New Revision: 6298
Added:
benchmarks/benchmark-fwk/trunk/conf/cachebench-local.xml
benchmarks/benchmark-fwk/trunk/runAllLocal.sh
Log:
new cfgs
Copied: benchmarks/benchmark-fwk/trunk/conf/cachebench-local.xml (from rev 6297, benchmarks/benchmark-fwk/trunk/conf/cachebench.xml)
===================================================================
--- benchmarks/benchmark-fwk/trunk/conf/cachebench-local.xml (rev 0)
+++ benchmarks/benchmark-fwk/trunk/conf/cachebench-local.xml 2008-07-16 13:13:16 UTC (rev 6298)
@@ -0,0 +1,96 @@
+<!--
+ Configures and controls the behaviour of the cache benchmarking framework.
+
+ TODO - sample size is test specific, move it to the test that uses it rather than having it here
+ sampleSize - this is the number of putsgets to be performed, an average is used in metrics.
+ gcBetweenTestsEnabled - if true, the framework pauses between each test and requests System.gc() - use this if you find yourself running out of mem!
+ sleepBetweenTests - ms to sleep between tests. useful to allow the JVM some time to do a gc
+ emptyCacheBetweenTests - again, use if you're running out of mem.
+ numThreads - the number of executor threads to use to perform the required number of operations.
+-->
+<cachebench sampleSize="500000" gcBetweenTestsEnabled="true" sleepBetweenTests="1000" emptyCacheBetweenTests="false"
+ numThreads="25">
+
+
+ <!--
+ There are various steps we want to start executing at once: e.g. all the tests should start at the same time,
+ otherwise (part of) cluster operations do not replicate on all instances. We configure here one socket addresses
+ on each cluster node, so that the framework can communicate with all the nodes and barrier whenever needed.
+ - for each node instance socket address is specified. You can make sure that addresses are available by using
+ checkClusterAddresses ant target
+ -->
+ <cluster>
+ <member host="cluster01" port="17900"/>
+ <member host="cluster02" port="17900"/>
+ <member host="cluster03" port="17900"/>
+ <member host="cluster04" port="17900"/>
+ <member host="cluster05" port="17900"/>
+ <member host="cluster06" port="17900"/>
+ <member host="cluster07" port="17900"/>
+ <member host="cluster08" port="17900"/>
+ <member host="cluster09" port="17900"/>
+ <member host="cluster10" port="17900"/>
+ </cluster>
+
+ <!--
+ Locagically groups multiple tests.
+ param stopOnFailre : if true and one of the tests fails unexpectedly then the fwk will not run any other tests in
+ testcase. By default set to true.
+ -->
+
+ <testcase name="NonClusteredTest" stopOnFailure="true">
+
+ <!-- org.cachebench.warmup.PutGetCacheWarmup warms up the cache by doing operation on it; simulates a real-world environment.
+ If no warmup is needed use org.cachebench.warmup.NoCacheWarmup
+ -->
+ <warmup warmupClass="org.cachebench.warmup.PutGetCacheWarmup">
+ <param name="operationCount" value="10000"/>
+ </warmup>
+
+ <!--
+ validates that replication is enabled and works. If repl does not occur and the stopOnFailure is set to true then exists.
+ Should be used to make sure that replication is enabled; see javadoc for more details
+ -->
+ <!--<test name="replicationOccurrsTest" testClass="org.cachebench.tests.ReplicationOccursTest">-->
+ <!--<param name="partialReplication" value="true"/>-->
+ <!--</test>-->
+
+ <!--
+ * The "name" attrib is just used for display in the reports.
+ * You can write your own custom testClass.
+ * weight is currently unused.
+ -->
+ <test name="Strings" testClass="org.cachebench.tests.simpletests.StringTest" weight="2.0"/>
+
+ <!--<test name="SessionSimulator" testClass="org.cachebench.tests.SessionSimulatorTest" weight="2.0">-->
+ <!--<param name="numberOfRequest" value="100000"/>-->
+ <!--<param name="numberOfAttributes" value="100"/>-->
+ <!--<param name="writePercentage" value="20"/>-->
+ <!--<param name="sizeOfAnAttribute" value="1000"/>-->
+ <!--</test>-->
+
+ <!--
+ <test name="Primitive Wrappers" testClass="org.cachebench.tests.simpletests.PrimitiveTest" weight="1.0" />
+ <test name="Custom Class Types" testClass="org.cachebench.tests.simpletests.CustomClassTest" weight="1.0" />
+ <test name="Custom Subclasses of Abstracts" testClass="org.cachebench.tests.simpletests.SubclassTest" weight="1.5" />
+ <test name="Custom Types With Transients" testClass="org.cachebench.tests.simpletests.TransientTest" weight="1.0" />
+ <test name="Custom Types With Statics" testClass="org.cachebench.tests.simpletests.StaticsTest" weight="1.5" />
+ <test name="Custom Types With Associations" testClass="org.cachebench.tests.simpletests.AssociationsTest" weight="2.0" />
+ -->
+
+ <!-- WARNING - Configuration file name is now DEPRECATED and will be ignored. Please pass in your cache config
+file name that you wish to use with the -DcacheBenchFwk.cacheConfigFile JVM parameter. The runNode.sh
+and cluster.sh scripts will also do this for you. -->
+ </testcase>
+
+
+ <!--
+ Available generators are: CSVReportGenerator and ClusterReportGenerator.
+ See javadocs for org.cachebench.reportgenerators.ReportGenerator for writing your
+ own report generators such as XML generators, graphic generators, etc
+ -->
+ <!-- The CSV report generated can be plugged in to a spreadsheet to generate graphs. If 'outputFile is set to
+ '-generic-' then the name would be generated as follows: 'data_<cache-product>_<configuration>_<cluster-size>.csv' -->
+ <report outputFile="-generic-" generator="org.cachebench.reportgenerators.CsvStatisticReportGenerator"/>
+
+</cachebench>
Added: benchmarks/benchmark-fwk/trunk/runAllLocal.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/runAllLocal.sh (rev 0)
+++ benchmarks/benchmark-fwk/trunk/runAllLocal.sh 2008-07-16 13:13:16 UTC (rev 6298)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+./runLocalNode.sh jbosscache-2.2.0 pess-local.xml
+./runLocalNode.sh jbosscache-2.2.0 mvcc-local.xml
+./runLocalNode.sh jbosscache-2.2.0 pess-local-NONE.xml
+./runLocalNode.sh ehcache-1.4.1 ehcache-local.xml
+
+mkdir output
+mv data* ./output
+
+./generateChart.sh -reportDir output -o 28MAY -chartType putget
+
Property changes on: benchmarks/benchmark-fwk/trunk/runAllLocal.sh
___________________________________________________________________
Name: svn:executable
+ *
17 years, 5 months
JBoss Cache SVN: r6297 - benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-07-16 09:04:02 -0400 (Wed, 16 Jul 2008)
New Revision: 6297
Modified:
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/config.sh
Log:
fixed config.sh
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/config.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/config.sh 2008-07-16 12:45:22 UTC (rev 6296)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/config.sh 2008-07-16 13:04:02 UTC (rev 6297)
@@ -15,4 +15,4 @@
#--classpath was set
#additional JVM options
-JVM_OPTIONS="$JVM_OPTIONS -Xmx1024m -Djava.net.preferIPv4Stack=true" JVM_OPTIONS="$JVM_OPTIONS -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.JBossCache220Wrapper"
\ No newline at end of file
+JVM_OPTIONS="$JVM_OPTIONS -Xmx1024m -Djava.net.preferIPv4Stack=true" JVM_OPTIONS="$JVM_OPTIONS -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.JBossCache300Wrapper"
\ No newline at end of file
17 years, 5 months
JBoss Cache SVN: r6296 - benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-07-16 08:45:22 -0400 (Wed, 16 Jul 2008)
New Revision: 6296
Added:
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jta.jar
Log:
Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jta.jar
===================================================================
(Binary files differ)
Property changes on: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jta.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
17 years, 5 months
JBoss Cache SVN: r6295 - in core/trunk/src/main: resources/config-samples and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-07-16 08:38:02 -0400 (Wed, 16 Jul 2008)
New Revision: 6295
Modified:
core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java
core/trunk/src/main/resources/config-samples/buddy-replication.xml
core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml
core/trunk/src/main/resources/config-samples/invalidation-async.xml
core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml
Log:
Wording and typos
Modified: core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java 2008-07-16 12:17:46 UTC (rev 6294)
+++ core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java 2008-07-16 12:38:02 UTC (rev 6295)
@@ -56,7 +56,7 @@
}
catch (OldFileFormatException e)
{
- log.warn(configFileName + " is an old configuration file; We stronly suggest migrating to the new file format(tools are available for that)");
+ log.warn("Detected legacy configuration file format when parsing [" + configFileName + "]. Migrating to the new (3.x) file format is recommended. See FAQs for details.");
XmlConfigurationParser2x oldParser = new XmlConfigurationParser2x();
c = oldParser.parseFile(configFileName);
}
@@ -145,7 +145,7 @@
}
catch (OldFileFormatException e)
{
- log.warn("This is an old configuration file; We stronly suggest migrating to the new file format (tools are available for that)");
+ log.warn("Detected legacy configuration file format when parsing configuration file. Migrating to the new (3.x) file format is recommended. See FAQs for details.");
XmlConfigurationParser2x oldParser = new XmlConfigurationParser2x();
c = oldParser.parseStream(is);
}
Modified: core/trunk/src/main/resources/config-samples/buddy-replication.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/buddy-replication.xml 2008-07-16 12:17:46 UTC (rev 6294)
+++ core/trunk/src/main/resources/config-samples/buddy-replication.xml 2008-07-16 12:38:02 UTC (rev 6295)
@@ -19,10 +19,10 @@
<!-- Configure the TransactionManager -->
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <!--
- timeout: The max amount of time (in milliseconds) we wait until the state (ie. the contents of the cache) is
- retrieved from existing members in a clustered environment
- -->
+ <!--
+ timeout: The max amount of time (in milliseconds) we wait until the state (i.e. the contents of the cache) is
+ retrieved from existing members in a clustered environment
+ -->
<stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster">
@@ -63,7 +63,7 @@
<!--
poolName: A way to specify a preferred replication group. If specified, we try and pick a buddy why shares
the same pool name (falling back to other buddies if not available). This allows the sysdmin
- to hint at backup buddies are picked, so for example, nodes may be hinted topick buddies
+ to hint at backup buddies are picked, so for example, nodes may be hinted to pick buddies
on a different physical rack or power supply for added fault tolerance.
communicationTimeout : communication timeout for inter-buddy group organisation messages (such as assigning
to and removing from groups
Modified: core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml 2008-07-16 12:17:46 UTC (rev 6294)
+++ core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml 2008-07-16 12:38:02 UTC (rev 6295)
@@ -19,7 +19,8 @@
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<!-- Specific eviction policy configurations -->
- <eviction wakeUpInterval="5000" defaultPolicyClass="org.jboss.cache.eviction.LRUPolicy" defaultEventQueueSize="200000">
+ <eviction wakeUpInterval="5000" defaultPolicyClass="org.jboss.cache.eviction.LRUPolicy"
+ defaultEventQueueSize="200000">
<!-- Cache wide default -->
<default>
<attribute name="maxNodes">5000</attribute>
@@ -32,10 +33,10 @@
</eviction>
<!-- Cache Passivation for Tree Cache
- On pasivation, The objects are written to the backend store on eviction if passivation
- is true, otheriwse the objects are persisted. On activation, the objects are restored in
+ On passivation, The objects are written to the backend store on eviction if passivation
+ is true, otherwise the objects are persisted. On activation, the objects are restored in
the memory cache and removed from the cache loader if 'passivation' attribute is true,
- otherwise the objects are only loaded from the cache loader -->
+ otherwise the objects are only loaded from the cache loader -->
<loaders passivation="false" shared="false">
<preload>
<node fqn="/"/>
Modified: core/trunk/src/main/resources/config-samples/invalidation-async.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/invalidation-async.xml 2008-07-16 12:17:46 UTC (rev 6294)
+++ core/trunk/src/main/resources/config-samples/invalidation-async.xml 2008-07-16 12:38:02 UTC (rev 6295)
@@ -19,11 +19,11 @@
<!-- Configure the TransactionManager -->
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <!--
- timeout: The max amount of time (in milliseconds) we wait until the
- state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
+ <!--
+ timeout: The max amount of time (in milliseconds) we wait until the
+ state (i.e. the contents of the cache) are retrieved from
+ existing members in a clustered environment
+ -->
<stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster">
Modified: core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml 2008-07-16 12:17:46 UTC (rev 6294)
+++ core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml 2008-07-16 12:38:02 UTC (rev 6295)
@@ -20,7 +20,7 @@
<!--
timeout: The max amount of time (in milliseconds) we wait until the
- state (ie. the contents of the cache) are retrieved from
+ state (i.e. the contents of the cache) are retrieved from
existing members in a clustered environment
-->
<stateRetrieval timeout="20000"/>
@@ -35,8 +35,8 @@
<sync replTimeout="15000"/>
<!-- poolName: A way to specify a preferred replication group. If specified, we try and pick a buddy why shares
- the same pool name (falling back to other buddies if not available). This allows the sysdmin
- to hint at backup buddies are picked, so for example, nodes may be hinted topick buddies
+ the same pool name (falling back to other buddies if not available). This allows the sysadmin
+ to hint at backup buddies are picked, so for example, nodes may be hinted to pick buddies
on a different physical rack or power supply for added fault tolerance.
communicationTimeout : communication timeout for inter-buddy group organisation messages (such as assigning
to and removing from groups
@@ -62,5 +62,5 @@
</locator>
</buddy>
</replication>
-
+
</jbosscache>
17 years, 5 months
JBoss Cache SVN: r6294 - benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-07-16 08:17:46 -0400 (Wed, 16 Jul 2008)
New Revision: 6294
Added:
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jbosscache-core.jar
Log:
added missing jbc3.x file
Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jbosscache-core.jar
===================================================================
(Binary files differ)
Property changes on: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jbosscache-core.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
17 years, 5 months