7:03 p.m.
Author: manik.surtani(a)jboss.com
Date: 2009-04-27 13:03:33 -0400 (Mon, 27 Apr 2009)
New Revision: 8003
Added:
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/dist-async.xml
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/dist-sync.xml
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-async.xml
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-sync.xml
Removed:
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-sync-RR.xml
Modified:
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/local-RC-FIFO.xml
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/local-RR-FIFO.xml
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/local-RR.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RR-FIFO.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RR.xml
benchmarks/benchmark-fwk/trunk/infinispan.sh
Log:
Updated configs and added a shell script to test infinispan vs JBC
Added: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/dist-async.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/dist-async.xml
(rev 0)
+++
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/dist-async.xml 2009-04-27
17:03:33 UTC (rev 8003)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:infinispan:config:4.0">
+ <global>
+
+ <transport clusterName="infinispan-cluster">
+ <property name="configurationFile" value="tcp.xml"/>
+ </transport>
+
+ </global>
+
+
+ <default>
+ <locking
+ lockAcquisitionTimeout="20000"
+ concurrencyLevel="10000"/>
+
+ <transaction
+
transactionManagerLookupClass="org.infinispan.transaction.GenericTransactionManagerLookup"
+ syncRollbackPhase="false"
+ syncCommitPhase="false"/>
+
+ <clustering mode="d">
+ <async />
+ </clustering>
+ </default>
+</infinispan>
Property changes on:
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/dist-async.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/dist-sync.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/dist-sync.xml
(rev 0)
+++
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/dist-sync.xml 2009-04-27
17:03:33 UTC (rev 8003)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:infinispan:config:4.0">
+
+ <global>
+
+ <transport clusterName="infinispan-cluster">
+ <property name="configurationFile" value="tcp.xml"/>
+ </transport>
+
+ </global>
+
+ <default>
+ <locking
+ lockAcquisitionTimeout="20000"
+ concurrencyLevel="10000"/>
+ <transaction
+
transactionManagerLookupClass="org.infinispan.transaction.GenericTransactionManagerLookup"
+ syncRollbackPhase="false"
+ syncCommitPhase="false"/>
+
+ <clustering mode="d">
+ <sync replTimeout="20000"/>
+ </clustering>
+ </default>
+
+</infinispan>
Property changes on:
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/dist-sync.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified:
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/local-RC-FIFO.xml
===================================================================
---
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/local-RC-FIFO.xml 2009-04-27
16:47:29 UTC (rev 8002)
+++
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/local-RC-FIFO.xml 2009-04-27
17:03:33 UTC (rev 8003)
@@ -2,7 +2,7 @@
<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:infinispan:config:4.0">
<default>
- <locking concurrencyLevel="10000"
isolationLevel="READ_COMMITTED" />
+ <locking isolationLevel="READ_COMMITTED"/>
<eviction wakeUpInterval="1000" maxEntries="10000"
strategy="FIFO"/>
</default>
</infinispan>
Modified:
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/local-RR-FIFO.xml
===================================================================
---
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/local-RR-FIFO.xml 2009-04-27
16:47:29 UTC (rev 8002)
+++
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/local-RR-FIFO.xml 2009-04-27
17:03:33 UTC (rev 8003)
@@ -2,7 +2,7 @@
<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:infinispan:config:4.0">
<default>
- <locking concurrencyLevel="10000"
isolationLevel="REPEATABLE_READ" />
+ <locking concurrencyLevel="10000"
isolationLevel="REPEATABLE_READ" writeSkewCheck="false"/>
<eviction wakeUpInterval="1000" maxEntries="10000"
strategy="FIFO"/>
</default>
</infinispan>
Modified:
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/local-RR.xml
===================================================================
---
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/local-RR.xml 2009-04-27
16:47:29 UTC (rev 8002)
+++
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/local-RR.xml 2009-04-27
17:03:33 UTC (rev 8003)
@@ -2,6 +2,6 @@
<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:infinispan:config:4.0">
<default>
- <locking concurrencyLevel="10000"
isolationLevel="REPEATABLE_READ" />
+ <locking concurrencyLevel="10000"
isolationLevel="REPEATABLE_READ" writeSkewCheck="false"/>
</default>
</infinispan>
Added: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-async.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-async.xml
(rev 0)
+++
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-async.xml 2009-04-27
17:03:33 UTC (rev 8003)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:infinispan:config:4.0">
+
+ <global>
+
+ <transport clusterName="infinispan-cluster">
+ <property name="configurationFile" value="tcp.xml"/>
+ </transport>
+
+ </global>
+
+ <default>
+
+ <locking
+ lockAcquisitionTimeout="20000"
+ concurrencyLevel="10000"/>
+
+ <transaction
+
transactionManagerLookupClass="org.infinispan.transaction.GenericTransactionManagerLookup"
+ syncRollbackPhase="false"
+ syncCommitPhase="false"/>
+
+ <clustering mode="r">
+ <stateRetrieval fetchInMemoryState="false"/>
+ <async />
+ </clustering>
+ </default>
+
+</infinispan>
Property changes on:
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-async.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted:
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-sync-RR.xml
===================================================================
---
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-sync-RR.xml 2009-04-27
16:47:29 UTC (rev 8002)
+++
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-sync-RR.xml 2009-04-27
17:03:33 UTC (rev 8003)
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:infinispan:config:4.0">
-
- <!-- *************************** -->
- <!-- System-wide global settings -->
- <!-- *************************** -->
-
- <global>
-
- <!--
- If the transport is omitted, there is no way to create distributed or clustered
caches.
- There is no added cost to defining a transport but not creating a cache that
uses one, since the transport
- is created and initialized lazily.
- -->
- <transport
transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport"
clusterName="infinispan-cluster"
- distributedSyncTimeout="5000">
- <!-- Note that the JGroups transport uses sensible defaults if no
configuration property is defined. -->
- <property name="configurationFile" value="tcp.xml"/>
- <!-- See the JGroupsTransport javadocs for more flags -->
- </transport>
-
- </global>
-
- <!-- *************************** -->
- <!-- Default "template" settings -->
- <!-- *************************** -->
- <!-- this is used as a "template" configuration for all caches in the
system. -->
- <default>
- <!--
- isolation levels supported: READ_COMMITTED and REPEATABLE_READ
- -->
- <locking
- isolationLevel="REPEATABLE_READ"
- lockAcquisitionTimeout="20000"
- writeSkewCheck="false"
- concurrencyLevel="500"/>
-
- <!--
- Used to register a transaction manager and participate in ongoing transactions.
- -->
- <transaction
-
transactionManagerLookupClass="org.infinispan.transaction.GenericTransactionManagerLookup"
- syncRollbackPhase="false"
- syncCommitPhase="false"/>
-
- <!--
- This element specifies that the cache is clustered.
- modes supported: replication (r) or invalidation (i).
- -->
- <clustering mode="replication">
-
- <!--
- Defines whether to retrieve state on startup
- -->
- <stateRetrieval timeout="20000"
fetchInMemoryState="false"/>
-
- <!--
- Network calls are synchronous.
- -->
- <sync replTimeout="20000"/>
- <!--
- Uncomment this for async replication.
- -->
- <!--<async useReplQueue="true"
replQueueInterval="10000" replQueueMaxElements="500"/>-->
- </clustering>
- </default>
-
-</infinispan>
Copied: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-sync.xml
(from rev 8002,
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-sync-RR.xml)
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-sync.xml
(rev 0)
+++
benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/repl-sync.xml 2009-04-27
17:03:33 UTC (rev 8003)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:infinispan:config:4.0">
+
+ <global>
+
+ <transport clusterName="infinispan-cluster">
+ <property name="configurationFile" value="tcp.xml"/>
+ </transport>
+
+ </global>
+
+ <default>
+
+ <locking
+ lockAcquisitionTimeout="20000"
+ concurrencyLevel="10000"/>
+
+ <transaction
+
transactionManagerLookupClass="org.infinispan.transaction.GenericTransactionManagerLookup"
+ syncRollbackPhase="false"
+ syncCommitPhase="false"/>
+
+ <clustering mode="r">
+
+ <stateRetrieval fetchInMemoryState="false"/>
+ <sync replTimeout="20000"/>
+ </clustering>
+ </default>
+
+</infinispan>
Modified:
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RR-FIFO.xml
===================================================================
---
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RR-FIFO.xml 2009-04-27
16:47:29 UTC (rev 8002)
+++
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RR-FIFO.xml 2009-04-27
17:03:33 UTC (rev 8003)
@@ -1,7 +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="10000"
+ concurrencyLevel="10000" writeSkewCheck="false"
lockParentForChildInsertRemove="false"/>
<transaction
transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<eviction wakeUpInterval="1000">
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-04-27
16:47:29 UTC (rev 8002)
+++
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RR.xml 2009-04-27
17:03:33 UTC (rev 8003)
@@ -1,7 +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"
+ concurrencyLevel="3000" writeSkewCheck="false"
lockParentForChildInsertRemove="false"/>
<transaction
transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
</jbosscache>
Modified: benchmarks/benchmark-fwk/trunk/infinispan.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/infinispan.sh 2009-04-27 16:47:29 UTC (rev 8002)
+++ benchmarks/benchmark-fwk/trunk/infinispan.sh 2009-04-27 17:03:33 UTC (rev 8003)
@@ -1,8 +1,8 @@
#!/bin/bash
-scaling="2"
-configs="repl-sync-RR.xml"
-#configs="distributed replicated"
+scaling="2 4 6 8"
+configs="repl-sync.xml repl-async.xml dist-sync.xml dist-async.xml"
+
products="infinispan-4.0.0"
mkdir output
@@ -27,7 +27,31 @@
done
done
+configs="mvcc-repl-sync.xml mvcc-repl-async.xml mvcc-repl-sync-br.xml
mvcc-repl-async-br.xml"
+products="jbosscache-3.0.0"
+
+for product in $products
+do
+ for config in $configs
+ do
+ for size in $scaling
+ do
+ nohup ./cluster.sh start $product $config $size
+
+ outputFileName=data_${product}_${config}_${size}.csv
+ while [ ! -e $outputFileName ]
+ do
+ echo "Waiting for report [ $outputFileName ]"
+ sleep 5
+ done
+ sleep 60
+ mv $outputFileName output/
+ done
+ done
+done
+
+
echo Generating charts ...
-./generateChart -reportDir output
+./generateChart.sh -reportDir output