Author: mircea.markus Date: 2009-10-29 09:29:06 -0400 (Thu, 29 Oct 2009) New Revision: 8273 Added: benchmarks/benchmark-fwk/trunk/kill_all_vms.sh Modified: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh benchmarks/benchmark-fwk/trunk/bindAddress.sh benchmarks/benchmark-fwk/trunk/build.xml benchmarks/benchmark-fwk/trunk/cluster.sh benchmarks/benchmark-fwk/trunk/conf/cachebench.xml benchmarks/benchmark-fwk/trunk/conf/log4j.xml benchmarks/benchmark-fwk/trunk/infinispan.sh benchmarks/benchmark-fwk/trunk/runNode.sh Log: Modified: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh =================================================================== --- benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh 2009-10-29 11:54:42 UTC (rev 8272) +++ benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh 2009-10-29 13:29:06 UTC (rev 8273) @@ -1,10 +1,11 @@ #!/bin/bash scaling="2 4 6 8" -configs="pess-repl-sync.xml pess-repl-sync-br.xml pess-repl-async.xml mvcc-repl-sync.xml mvcc-repl-sync-br.xml mvcc-repl-async.xml" -#configs="distributed replicated" -products="jbosscache-3.0.0" +#configs="udp-dist-async-l1.xml udp-dist-async-nol1.xml" +configs="mvcc-repl-async.xml" +#products="infinispan-4.0.0" +products="jbosscache-3.1.0" mkdir output for product in $products Modified: benchmarks/benchmark-fwk/trunk/bindAddress.sh =================================================================== --- benchmarks/benchmark-fwk/trunk/bindAddress.sh 2009-10-29 11:54:42 UTC (rev 8272) +++ benchmarks/benchmark-fwk/trunk/bindAddress.sh 2009-10-29 13:29:06 UTC (rev 8273) @@ -1,5 +1,5 @@ #!/bin/sh ### Set your bind address for the tests to use. Could be an IP, host name or a reference to an environment variable. -BIND_ADDRESS=${MYTESTIP_2} - +#BIND_ADDRESS=${MYTESTIP} +BIND_ADDRESS=`/sbin/ifconfig eth0 | grep "inet addr" | sed -e "s/^.*addr://g" -e "s/ .*$//g"` Modified: benchmarks/benchmark-fwk/trunk/build.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/build.xml 2009-10-29 11:54:42 UTC (rev 8272) +++ benchmarks/benchmark-fwk/trunk/build.xml 2009-10-29 13:29:06 UTC (rev 8273) @@ -233,18 +233,18 @@ </javac> </target> - <target name="compile.module.jbosscache300" depends="fwk" - description="Compile module jbosscache-3.0.0"> - <mkdir dir="./classes/production/jbosscache-3.0.0"/> - <javac destdir="./classes/production/jbosscache-3.0.0" debug="${compiler.debug}" + <target name="compile.module.jbosscache310" depends="fwk" + description="Compile module jbosscache-3.1.0"> + <mkdir dir="./classes/production/jbosscache-3.1.0"/> + <javac destdir="./classes/production/jbosscache-3.1.0" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" fork="true"> <classpath> - <fileset dir="./cache-products/jbosscache-3.0.0/lib" includes="*.jar"/> + <fileset dir="./cache-products/jbosscache-3.1.0/lib" includes="*.jar"/> <fileset dir="./lib/common" includes="*.jar"/> <pathelement location="./lib/commons-logging.jar"/> <pathelement location="${framework.output.dir}"/> </classpath> - <src path="./cache-products/jbosscache-3.0.0/src"/> + <src path="./cache-products/jbosscache-3.1.0/src"/> </javac> </target> @@ -268,7 +268,7 @@ </target> <target name="all" - depends="clean, fwk, compile.module.jbosscache140, compile.module.jbosscache200, compile.module.pojocache220, compile.module.jbosscache210, compile.module.jbosscache220, compile.module.terracotta250, compile.module.ehcache150, compile.module.ehcache160, compile.module.whirlycache101, compile.module.jbosscache300, compile.module.coherence331, compile.module.infinispan400" + depends="clean, fwk, compile.module.infinispan400, compile.module.jbosscache310" description="build all"/> <target name="checkClusterAddresses" depends="fwk" Modified: benchmarks/benchmark-fwk/trunk/cluster.sh =================================================================== --- benchmarks/benchmark-fwk/trunk/cluster.sh 2009-10-29 11:54:42 UTC (rev 8272) +++ benchmarks/benchmark-fwk/trunk/cluster.sh 2009-10-29 13:29:06 UTC (rev 8273) @@ -30,11 +30,11 @@ COMMAND=${1} # the DNS domain of your servers -DOMAIN="qa.atl.jboss.com" +DOMAIN="" # the host names of available servers -HOSTNAMES=( cluster01 cluster02 cluster03 cluster04 cluster05 cluster06 cluster07 cluster08 cluster09 cluster10 ) +HOSTNAMES=( slave1 slave2 slave3 slave4 slave5 slave6 slave7 slave8 slave9 slave10 slave11 slave12 ) -CACHE_BENCHMARK_HOME=`pwd` +CACHE_BENCHMARK_HOME=/opt/shared/old_benchmark_trunk echo "Using cache benchmark home: $CACHE_BENCHMARK_HOME" case $COMMAND in @@ -43,7 +43,7 @@ do server="${HOSTNAMES[idx]}" echo Starting CacheBenchmarkFramework on host ${server} - ssh ${SSH_USER}(a)${server}.${DOMAIN} ". .bash_profile && cd ${CACHE_BENCHMARK_HOME} && ./runNode.sh ${idx} ${CACHE_DIST} ${CFG_FILE} ${NUM_SERVERS} &" & + ssh ${SSH_USER}@${server} ". .bash_profile && cd ${CACHE_BENCHMARK_HOME} && ./runNode.sh ${idx} ${CACHE_DIST} ${CFG_FILE} ${NUM_SERVERS} &" & echo "Return code from ssh call is $?" sleep 2 done @@ -53,7 +53,7 @@ do server="${HOSTNAMES[idx]}" echo Stopping CacheBenchmarkFramework on host ${server} - ssh ${SSH_USER}(a)${server}.${DOMAIN} "cd ${CACHE_BENCHMARK_HOME} && ./killNode.sh &" + ssh ${SSH_USER}@${server} "cd ${CACHE_BENCHMARK_HOME} && ./killNode.sh &" done ;; *) Modified: benchmarks/benchmark-fwk/trunk/conf/cachebench.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/conf/cachebench.xml 2009-10-29 11:54:42 UTC (rev 8272) +++ benchmarks/benchmark-fwk/trunk/conf/cachebench.xml 2009-10-29 13:29:06 UTC (rev 8273) @@ -8,7 +8,7 @@ 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="true" +<cachebench gcBetweenTestsEnabled="true" sleepBetweenTests="1000" emptyCacheBetweenTests="true" useTransactions="false" numThreads="10"> @@ -20,16 +20,18 @@ 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"/> + <member host="slave1" port="17900"/> + <member host="slave2" port="17900"/> + <member host="slave3" port="17900"/> + <member host="slave4" port="17900"/> + <member host="slave5" port="17900"/> + <member host="slave6" port="17900"/> + <member host="slave7" port="17900"/> + <member host="slave8" port="17900"/> + <member host="slave9" port="17900"/> + <member host="slave10" port="17900"/> + <member host="slave11" port="17900"/> + <member host="slave12" port="17900"/> </cluster> <!-- @@ -43,7 +45,7 @@ <!-- 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"> + <warmup warmupClass="org.cachebench.warmup.NoCacheWarmup"> <param name="operationCount" value="10000"/> </warmup> @@ -51,11 +53,10 @@ 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"/> + <param name="partialReplication" value="false"/> </test> ---> <!-- * The "name" attrib is just used for display in the reports. * You can write your own custom testClass. @@ -69,7 +70,7 @@ --> - <test name="SessionSimulator" testClass="org.cachebench.tests.SessionSimulatorTest" weight="2.0"> + <test name="SessionSimulator" testClass="org.cachebench.tests.SessionSimulatorTest"> <param name="numberOfRequest" value="500000"/> <param name="numberOfAttributes" value="100"/> <param name="writePercentage" value="10"/> Modified: benchmarks/benchmark-fwk/trunk/conf/log4j.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/conf/log4j.xml 2009-10-29 11:54:42 UTC (rev 8272) +++ benchmarks/benchmark-fwk/trunk/conf/log4j.xml 2009-10-29 13:29:06 UTC (rev 8273) @@ -59,7 +59,7 @@ </category> <category name="org.cachebench"> - <priority value="INFO"/> + <priority value="TRACE"/> </category> <category name="org.cachebench.reportgenerators"> @@ -87,7 +87,7 @@ </category> <category name="org.infinispan"> - <priority value="ERROR"/> + <priority value="WARN"/> </category> <!-- Here goes the root --> Modified: benchmarks/benchmark-fwk/trunk/infinispan.sh =================================================================== --- benchmarks/benchmark-fwk/trunk/infinispan.sh 2009-10-29 11:54:42 UTC (rev 8272) +++ benchmarks/benchmark-fwk/trunk/infinispan.sh 2009-10-29 13:29:06 UTC (rev 8273) @@ -1,7 +1,7 @@ #!/bin/bash scaling="2 4 6 8" -configs="repl-sync.xml repl-async.xml dist-sync.xml dist-async.xml" +configs="repl-sync.xml repl-async.xml udp-dist-sync-l1.xml udp-dist-async-l1.xml udp-dist-sync-nol1.xml udp-dist-async-nol1.xml" products="infinispan-4.0.0" @@ -27,7 +27,7 @@ done done -configs="mvcc-repl-sync.xml mvcc-repl-async.xml mvcc-repl-sync-br.xml mvcc-repl-async-br.xml" +configs="mvcc-repl-sync.xml mvcc-repl-async.xml" products="jbosscache-3.0.0" Added: benchmarks/benchmark-fwk/trunk/kill_all_vms.sh =================================================================== --- benchmarks/benchmark-fwk/trunk/kill_all_vms.sh (rev 0) +++ benchmarks/benchmark-fwk/trunk/kill_all_vms.sh 2009-10-29 13:29:06 UTC (rev 8273) @@ -0,0 +1,3 @@ +#!/bin/bash + +i=1; while [ $i -lt 13 ] ; do ssh slave$i "killall -9 java" ; let "i+=1" ; done Property changes on: benchmarks/benchmark-fwk/trunk/kill_all_vms.sh ___________________________________________________________________ Name: svn:executable + * Modified: benchmarks/benchmark-fwk/trunk/runNode.sh =================================================================== --- benchmarks/benchmark-fwk/trunk/runNode.sh 2009-10-29 11:54:42 UTC (rev 8272) +++ benchmarks/benchmark-fwk/trunk/runNode.sh 2009-10-29 13:29:06 UTC (rev 8273) @@ -57,7 +57,7 @@ # Sample JPDA settings for remote socket debuging #JVM_OPTIONS="$JVM_OPTIONS -Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=y" -TO_EXECUTE="java $JVM_OPTIONS -cp $CLASSPATH org.cachebench.CacheBenchmarkRunner" +TO_EXECUTE="java $JVM_OPTIONS -cp $CLASSPATH org.cachebench.CacheBenchmarkRunner > ${CURRENT_INDEX}_stdout.txt 2>&1" if [ "$DEBUG" = "debug" ] then