[jbosscache-commits] JBoss Cache SVN: r8027 - in benchmarks/benchmark-fwk/branches/mavenized: assembly and 15 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Thu Apr 30 07:21:10 EDT 2009
Author: manik.surtani at jboss.com
Date: 2009-04-30 07:21:09 -0400 (Thu, 30 Apr 2009)
New Revision: 8027
Added:
benchmarks/benchmark-fwk/branches/mavenized/assembly/
benchmarks/benchmark-fwk/branches/mavenized/assembly/assembly.xml
benchmarks/benchmark-fwk/branches/mavenized/bin/
benchmarks/benchmark-fwk/branches/mavenized/bin/allJBossCacheTests.sh
benchmarks/benchmark-fwk/branches/mavenized/bin/bindAddress.sh
benchmarks/benchmark-fwk/branches/mavenized/bin/cluster.sh
benchmarks/benchmark-fwk/branches/mavenized/bin/compareJBC2and3.sh
benchmarks/benchmark-fwk/branches/mavenized/bin/generateChart.sh
benchmarks/benchmark-fwk/branches/mavenized/bin/infinispan.sh
benchmarks/benchmark-fwk/branches/mavenized/bin/jvm_params.sh
benchmarks/benchmark-fwk/branches/mavenized/bin/killNode.sh
benchmarks/benchmark-fwk/branches/mavenized/bin/runAllLocal.sh
benchmarks/benchmark-fwk/branches/mavenized/bin/runLocalNode.sh
benchmarks/benchmark-fwk/branches/mavenized/bin/runNode.sh
benchmarks/benchmark-fwk/branches/mavenized/framework/
benchmarks/benchmark-fwk/branches/mavenized/framework/src/
benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/
benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/
benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/
Removed:
benchmarks/benchmark-fwk/branches/mavenized/allJBossCacheTests.sh
benchmarks/benchmark-fwk/branches/mavenized/bindAddress.sh
benchmarks/benchmark-fwk/branches/mavenized/cache-products/ehcache-1.6.0/src/org/
benchmarks/benchmark-fwk/branches/mavenized/cache-products/infinispan-4.0.0/src/org/
benchmarks/benchmark-fwk/branches/mavenized/cache-products/jbosscache-2.0.0/src/org/
benchmarks/benchmark-fwk/branches/mavenized/cache-products/jbosscache-2.1.0/src/org/
benchmarks/benchmark-fwk/branches/mavenized/cache-products/jbosscache-2.2.0/src/org/
benchmarks/benchmark-fwk/branches/mavenized/cache-products/jbosscache-3.0.0/src/org/
benchmarks/benchmark-fwk/branches/mavenized/cluster.sh
benchmarks/benchmark-fwk/branches/mavenized/compareJBC2and3.sh
benchmarks/benchmark-fwk/branches/mavenized/generateChart.sh
benchmarks/benchmark-fwk/branches/mavenized/infinispan.sh
benchmarks/benchmark-fwk/branches/mavenized/jvm_params.sh
benchmarks/benchmark-fwk/branches/mavenized/killNode.sh
benchmarks/benchmark-fwk/branches/mavenized/runAllLocal.sh
benchmarks/benchmark-fwk/branches/mavenized/runAllLocalEH.sh
benchmarks/benchmark-fwk/branches/mavenized/runLocalNode.sh
benchmarks/benchmark-fwk/branches/mavenized/runNode.sh
benchmarks/benchmark-fwk/branches/mavenized/src/org/
Modified:
benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/cluster/Message.java
benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/cluster/Transport.java
benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/reportgenerators/PutGetChartGenerator.java
benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/reportgenerators/ThroughputChartGenerator.java
benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/smartfrog/CacheBenchmarkPrim.java
Log:
Deleted: benchmarks/benchmark-fwk/branches/mavenized/allJBossCacheTests.sh
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/allJBossCacheTests.sh 2009-04-30 11:20:46 UTC (rev 8026)
+++ benchmarks/benchmark-fwk/branches/mavenized/allJBossCacheTests.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -1,33 +0,0 @@
-#!/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"
-
-mkdir output
-
-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
Added: benchmarks/benchmark-fwk/branches/mavenized/assembly/assembly.xml
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/assembly/assembly.xml (rev 0)
+++ benchmarks/benchmark-fwk/branches/mavenized/assembly/assembly.xml 2009-04-30 11:21:09 UTC (rev 8027)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+
+ <formats>
+ <format>dir</format>
+ </formats>
+
+ <moduleSets>
+ <moduleSet>
+ <includeSubModules>false</includeSubModules>
+
+ <sources>
+ <includeModuleDirectory>false</includeModuleDirectory>
+
+ <fileSets>
+ <!-- Log4j XML -->
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>${module.basedir.name}/conf</outputDirectory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ </sources>
+
+ <binaries>
+ <outputDirectory>${module.basedir.name}/lib</outputDirectory>
+ <outputFileNameMapping>
+ ${module.artifactId}.${module.extension}
+ </outputFileNameMapping>
+ <unpack>false</unpack>
+ <dependencySets>
+ <dependencySet>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <outputDirectory>${module.basedir.name}/lib</outputDirectory>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+</assembly>
\ No newline at end of file
Property changes on: benchmarks/benchmark-fwk/branches/mavenized/assembly/assembly.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: benchmarks/benchmark-fwk/branches/mavenized/bin/allJBossCacheTests.sh (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/allJBossCacheTests.sh)
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/bin/allJBossCacheTests.sh (rev 0)
+++ benchmarks/benchmark-fwk/branches/mavenized/bin/allJBossCacheTests.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -0,0 +1,33 @@
+#!/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"
+
+mkdir output
+
+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
Copied: benchmarks/benchmark-fwk/branches/mavenized/bin/bindAddress.sh (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/bindAddress.sh)
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/bin/bindAddress.sh (rev 0)
+++ benchmarks/benchmark-fwk/branches/mavenized/bin/bindAddress.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -0,0 +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}
+
Copied: benchmarks/benchmark-fwk/branches/mavenized/bin/cluster.sh (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/cluster.sh)
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/bin/cluster.sh (rev 0)
+++ benchmarks/benchmark-fwk/branches/mavenized/bin/cluster.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+##################################################################################
+#
+# This script allows you to start multiple cache bench instances across a cluster
+#
+# Note that this requires BASH, as well as that all your instances have the cache
+# bench framework installed in the same location. Finally, it requires SSH keys
+# set up such that executing commands using
+#
+# $ ssh hostName "command"
+#
+# will work without prompting for passwords, or any user input.
+#
+##################################################################################
+
+## Some user-cnfigurable variables:
+
+# Defaults to the currently logged in user
+SSH_USER=${USER}
+
+# Cache instance you wish to run - taken from the command line.
+CACHE_DIST=${2}
+
+CFG_FILE=${3}
+
+# Number of servers to launch on - taken from the command line.
+NUM_SERVERS=${4}
+
+COMMAND=${1}
+
+# the DNS domain of your servers
+DOMAIN="qa.atl.jboss.com"
+# the host names of available servers
+HOSTNAMES=( cluster01 cluster02 cluster03 cluster04 cluster05 cluster06 cluster07 cluster08 cluster09 cluster10 )
+
+CACHE_BENCHMARK_HOME=`pwd`
+echo "Using cache benchmark home: $CACHE_BENCHMARK_HOME"
+
+case $COMMAND in
+ start)
+ for ((idx=0; idx < NUM_SERVERS ; idx++))
+ do
+ server="${HOSTNAMES[idx]}"
+ echo Starting CacheBenchmarkFramework on host ${server}
+ ssh ${SSH_USER}@${server}.${DOMAIN} ". .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
+ ;;
+ stop)
+ for ((idx=0; idx < ${#HOSTNAMES[*]} ; idx++))
+ do
+ server="${HOSTNAMES[idx]}"
+ echo Stopping CacheBenchmarkFramework on host ${server}
+ ssh ${SSH_USER}@${server}.${DOMAIN} "cd ${CACHE_BENCHMARK_HOME} && ./killNode.sh &"
+ done
+ ;;
+ *)
+ echo "Usage: ${0} [start | stop] [cache distribution to test] [name of configuration file to use] [number of servers to launch on]"
+ echo
+ echo "Example:"
+ echo " ${0} start jbosscache-2.0.0 repl_async.xml 6"
+ echo " ${0} stop"
+ echo " Note that the stop command will stop all instances on all configured hosts"
+ ;;
+esac
Copied: benchmarks/benchmark-fwk/branches/mavenized/bin/compareJBC2and3.sh (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/compareJBC2and3.sh)
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/bin/compareJBC2and3.sh (rev 0)
+++ benchmarks/benchmark-fwk/branches/mavenized/bin/compareJBC2and3.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+runOnCluster()
+{
+ config="$1"
+ scaling="2 4 6 8"
+ 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 10
+ done
+ sleep 30
+ mv $outputFileName output/
+ done
+}
+
+doLoop()
+{
+ echo Product is $product and cfg set is $configs
+ for config in $configs
+ do
+ echo running set for $product using $config
+ runOnCluster $config
+ done
+}
+
+jbc300()
+{
+ #### JBoss Cache 3.0.0
+ product="jbosscache-3.0.0"
+ configs="mvcc-repl-sync.xml mvcc-repl-sync-br.xml mvcc-repl-async.xml"
+ doLoop $product
+}
+
+jbc220()
+{
+ #### JBoss Cache 2.2.0
+ product="jbosscache-2.2.0"
+ configs="pess-repl-sync.xml pess-repl-sync-br.xml pess-repl-async.xml"
+ doLoop $product
+}
+
+ehcache()
+{
+ #### EHCache
+ product="ehcache-1.5.0"
+ configs="ehcache-repl-sync.xml ehcache-repl-async.xml"
+ doLoop $product
+}
+
+coherence()
+{
+ #### Coherence
+ product="coherence-3.3.1"
+ configs="repl-cache.xml dist-cache.xml"
+ doLoop $product
+}
+
+startTime=`date +%s`
+configs="" # This is global and accessible by all functions.
+
+if [ -e "output" ]
+then
+ mv output output`date +%s`.old
+fi
+mkdir output
+
+# jbc300
+# jbc220
+# ehcache
+coherence
+echo Generating charts ...
+
+./generateChart.sh -reportDir output
+
+endTime=`date +%s`
+minsTaken=`echo "scale=4;($endTime - $startTime)/60" | bc`
+
+echo -----
+echo -----
+echo Took $minsTaken minutes to run!
+echo -----
+echo -----
+
Copied: benchmarks/benchmark-fwk/branches/mavenized/bin/generateChart.sh (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/generateChart.sh)
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/bin/generateChart.sh (rev 0)
+++ benchmarks/benchmark-fwk/branches/mavenized/bin/generateChart.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+CP=.:classes/production/Framework:./conf
+
+for i in lib/*.jar
+do
+ CP=$CP:$i
+done
+
+java -cp $CP org.cachebench.reportgenerators.ChartGenerator ${*}
Copied: benchmarks/benchmark-fwk/branches/mavenized/bin/infinispan.sh (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/infinispan.sh)
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/bin/infinispan.sh (rev 0)
+++ benchmarks/benchmark-fwk/branches/mavenized/bin/infinispan.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+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
+
+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
+
+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.sh -reportDir output
Copied: benchmarks/benchmark-fwk/branches/mavenized/bin/jvm_params.sh (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/jvm_params.sh)
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/bin/jvm_params.sh (rev 0)
+++ benchmarks/benchmark-fwk/branches/mavenized/bin/jvm_params.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+### sets the JVM params for the instance that triggers test runnings
+export JVM_XMS=256m
+export JVM_XMX=1024m
\ No newline at end of file
Copied: benchmarks/benchmark-fwk/branches/mavenized/bin/killNode.sh (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/killNode.sh)
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/bin/killNode.sh (rev 0)
+++ benchmarks/benchmark-fwk/branches/mavenized/bin/killNode.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+##################################################################################
+#
+# This script allows you to kill benchmark runner instances started with runNode.sh
+#
+##################################################################################
+
+ps -elf | grep cacheBenchFwk.cacheWrapperClassName | grep -v grep | cut -c 14-20 | xargs -r kill -9
+ps -elf | grep allJBossCacheTests.sh | grep -v grep | cut -c 14-20 | xargs -r kill -9
+ps -elf | grep /runNode.sh | grep -v grep | cut -c 14-20 | xargs -r kill -9
+exit 0
\ No newline at end of file
Copied: benchmarks/benchmark-fwk/branches/mavenized/bin/runAllLocal.sh (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/runAllLocal.sh)
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/bin/runAllLocal.sh (rev 0)
+++ benchmarks/benchmark-fwk/branches/mavenized/bin/runAllLocal.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+for jdk in java5 java6 ; do
+source ${jdk}
+#jdk=java5
+rm -rf ./output/*
+
+export PLAIN_JVM_OPTIONS="${JVM_OPTIONS} -DcacheBenchFwk.fwkCfgFile=cachebench-local.xml -Xms2g -Xmx2g"
+unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)"
+./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RC.xml
+unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)"
+./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RR.xml
+unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(4.0.0.ALPHA2)"
+./runLocalNode.sh infinispan-4.0.0 local-RC.xml
+unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(4.0.0.ALPHA2)"
+./runLocalNode.sh infinispan-4.0.0 local-RR.xml
+unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)"
+./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RC-FIFO.xml
+unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)"
+./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RR-FIFO.xml
+unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(4.0.0.ALPHA2)"
+./runLocalNode.sh infinispan-4.0.0 local-RC-FIFO.xml
+unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(4.0.0.ALPHA2)"
+./runLocalNode.sh infinispan-4.0.0 local-RR-FIFO.xml
+
+
+mkdir output
+mv data* ./output
+
+./generateChart.sh -reportDir output -o LocalMode-${jdk} -chartType putget
+
+done
+
Copied: benchmarks/benchmark-fwk/branches/mavenized/bin/runLocalNode.sh (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/runLocalNode.sh)
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/bin/runLocalNode.sh (rev 0)
+++ benchmarks/benchmark-fwk/branches/mavenized/bin/runLocalNode.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -0,0 +1,61 @@
+#!/bin/bash
+# author: Mircea.Markus at jboss.com
+# cygwin users: add the scripts from :pserver:anoncvs at cygwin.com:/cvs/cygwin-apps/wrappers/java to the $cygwin_home/usr/local/bin
+# those would make an automatic conversion from unix CLASSPATH to win classpath, needed when executing java -cp
+
+preferIPv4Stack=true
+DEBUG=debug
+CACHE_PRODUCT=${1}
+TEST_CFG=${2}
+hostname=`hostname`
+PIDFILE=PID.${hostname}.pid
+
+if [ -z $1 ]
+then
+ echo Usage:
+ echo
+ echo ./runNode.sh [cache product to test] [test config file]
+ echo param [cache product to test] : must be one of the directories names under './cache-products'
+ echo param [test config file] : configuration file to use with the cache product. Typically resides in './cache-products/XXX/conf/'
+ echo
+ echo Example: './runNode.sh jbosscache-2.0.0 repl_async.xml' will start the 1st node running an instance of jbc2.0.0 in standalone [LOCAL] mode using the repl_async configuration.
+ exit 1
+fi
+
+#libraries needed by the fwk, add them to the classpath
+for JAR in ./lib/*
+do
+ CLASSPATH=$CLASSPATH:$JAR
+done
+
+export CLASSPATH=$CLASSPATH:./conf:./classes/production/Framework
+
+configFile=./cache-products/${CACHE_PRODUCT}/config.sh
+
+#first check whether the config file exists and load it
+if [ -f ${configFile} ]
+then
+ . ${configFile}
+ echo Calling ${configFile} exit code is $?
+else
+ echo could not find config file ${configFile}, aborting!
+ exit 2
+fi
+
+#. ./bindAddress.sh
+#echo bind address exit code is $?
+
+JVM_OPTIONS="${JVM_OPTIONS} -DcacheBenchFwk.cacheProductName=${CACHE_PRODUCT} -DcacheBenchFwk.cacheConfigFile=${TEST_CFG} -Djava.net.preferIPv4Stack=${preferIPv4Stack} -DlocalOnly=true"
+TO_EXECUTE="java $JVM_OPTIONS -cp $CLASSPATH org.cachebench.CacheBenchmarkRunner"
+
+if [ "$DEBUG" = "debug" ]
+then
+ echo Executing:
+ echo ${TO_EXECUTE}
+ echo
+fi
+
+${TO_EXECUTE}
+echo $!>${PIDFILE}
+echo "Return code from benchmark runner is $?"
+
Copied: benchmarks/benchmark-fwk/branches/mavenized/bin/runNode.sh (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/runNode.sh)
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/bin/runNode.sh (rev 0)
+++ benchmarks/benchmark-fwk/branches/mavenized/bin/runNode.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -0,0 +1,72 @@
+#!/bin/bash
+# author: Mircea.Markus at jboss.com
+# cygwin users: add the scripts from :pserver:anoncvs at cygwin.com:/cvs/cygwin-apps/wrappers/java to the $cygwin_home/usr/local/bin
+# those would make an automatic conversion from unix CLASSPATH to win classpath, needed when executing java -cp
+# todo mmarkus - add another configuration file to set all the jvm params, which should be called by this one (phps benchmatrk-jvm.sh)
+# todo mmarkus - move the scripts in an bin directory as there are more and more scrips now
+# todo mmarkus - if allJbossCacheTests.sh is launched with nohup it does not work, make that work
+
+preferIPv4Stack=true
+DEBUG=debug
+CURRENT_INDEX=${1}
+CACHE_PRODUCT=${2}
+TEST_CFG=${3}
+CLUSTER_SIZE=${4}
+hostname=`hostname`
+PIDFILE=PID.${hostname}.pid
+
+if [ -z $1 ]
+then
+ echo Usage:
+ echo
+ echo ./runNode.sh [current node index] [cache product to test] [test config file] [cluster size]
+ echo param [current node index] : the index of this node in the list of nodes in the cluster [0 .. <cluster size> - 1]
+ echo param [cache product to test] : must be one of the directories names under './cache-products'
+ echo param [test config file] : configuration file to use with the cache product. Typically resides in './cache-products/XXX/conf/'
+ echo param [cluster size] : total number of nodes that will run tests.
+ echo
+ echo Example: './runNode.sh 0 jbosscache-2.2.0 pess-repl-sync.xml 3' will start the 1st node running an instance of jbc2.0.0 on a cluster made out of 3 nodes, using the repl_async configuration.
+ exit 1
+fi
+
+#libraries needed by the fwk, add them to the classpath
+for JAR in ./lib/*
+do
+ CLASSPATH=$CLASSPATH:$JAR
+done
+
+export CLASSPATH=$CLASSPATH:./conf:./classes/production/Framework
+
+configFile=./cache-products/${CACHE_PRODUCT}/config.sh
+
+#first check whether the config file exists and load it
+if [ -f ${configFile} ]
+then
+ . ${configFile}
+ echo Calling ${configFile} exit code is $?
+else
+ echo could not find config file ${configFile}, aborting!
+ exit 2
+fi
+
+. ./bindAddress.sh
+. ./jvm_params.sh
+
+JVM_OPTIONS="${JVM_OPTIONS} -Xms${JVM_XMS} -Xmx${JVM_XMX} -DcacheBenchFwk.cacheProductName=${CACHE_PRODUCT} -Dbind.address=${BIND_ADDRESS} -DcacheBenchFwk.cacheConfigFile=${TEST_CFG} -DcurrentIndex=${CURRENT_INDEX} -DclusterSize=${CLUSTER_SIZE} -Djava.net.preferIPv4Stack=${preferIPv4Stack}"
+
+# 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"
+
+if [ "$DEBUG" = "debug" ]
+then
+ echo Executing:
+ echo ${TO_EXECUTE}
+ echo
+fi
+
+${TO_EXECUTE}
+#echo $!>${PIDFILE}
+echo "Return code from benchmark runner is $?"
+
Deleted: benchmarks/benchmark-fwk/branches/mavenized/bindAddress.sh
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/bindAddress.sh 2009-04-30 11:20:46 UTC (rev 8026)
+++ benchmarks/benchmark-fwk/branches/mavenized/bindAddress.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -1,5 +0,0 @@
-#!/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}
-
Deleted: benchmarks/benchmark-fwk/branches/mavenized/cluster.sh
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/cluster.sh 2009-04-30 11:20:46 UTC (rev 8026)
+++ benchmarks/benchmark-fwk/branches/mavenized/cluster.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-##################################################################################
-#
-# This script allows you to start multiple cache bench instances across a cluster
-#
-# Note that this requires BASH, as well as that all your instances have the cache
-# bench framework installed in the same location. Finally, it requires SSH keys
-# set up such that executing commands using
-#
-# $ ssh hostName "command"
-#
-# will work without prompting for passwords, or any user input.
-#
-##################################################################################
-
-## Some user-cnfigurable variables:
-
-# Defaults to the currently logged in user
-SSH_USER=${USER}
-
-# Cache instance you wish to run - taken from the command line.
-CACHE_DIST=${2}
-
-CFG_FILE=${3}
-
-# Number of servers to launch on - taken from the command line.
-NUM_SERVERS=${4}
-
-COMMAND=${1}
-
-# the DNS domain of your servers
-DOMAIN="qa.atl.jboss.com"
-# the host names of available servers
-HOSTNAMES=( cluster01 cluster02 cluster03 cluster04 cluster05 cluster06 cluster07 cluster08 cluster09 cluster10 )
-
-CACHE_BENCHMARK_HOME=`pwd`
-echo "Using cache benchmark home: $CACHE_BENCHMARK_HOME"
-
-case $COMMAND in
- start)
- for ((idx=0; idx < NUM_SERVERS ; idx++))
- do
- server="${HOSTNAMES[idx]}"
- echo Starting CacheBenchmarkFramework on host ${server}
- ssh ${SSH_USER}@${server}.${DOMAIN} ". .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
- ;;
- stop)
- for ((idx=0; idx < ${#HOSTNAMES[*]} ; idx++))
- do
- server="${HOSTNAMES[idx]}"
- echo Stopping CacheBenchmarkFramework on host ${server}
- ssh ${SSH_USER}@${server}.${DOMAIN} "cd ${CACHE_BENCHMARK_HOME} && ./killNode.sh &"
- done
- ;;
- *)
- echo "Usage: ${0} [start | stop] [cache distribution to test] [name of configuration file to use] [number of servers to launch on]"
- echo
- echo "Example:"
- echo " ${0} start jbosscache-2.0.0 repl_async.xml 6"
- echo " ${0} stop"
- echo " Note that the stop command will stop all instances on all configured hosts"
- ;;
-esac
Deleted: benchmarks/benchmark-fwk/branches/mavenized/compareJBC2and3.sh
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/compareJBC2and3.sh 2009-04-30 11:20:46 UTC (rev 8026)
+++ benchmarks/benchmark-fwk/branches/mavenized/compareJBC2and3.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -1,88 +0,0 @@
-#!/bin/bash
-
-runOnCluster()
-{
- config="$1"
- scaling="2 4 6 8"
- 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 10
- done
- sleep 30
- mv $outputFileName output/
- done
-}
-
-doLoop()
-{
- echo Product is $product and cfg set is $configs
- for config in $configs
- do
- echo running set for $product using $config
- runOnCluster $config
- done
-}
-
-jbc300()
-{
- #### JBoss Cache 3.0.0
- product="jbosscache-3.0.0"
- configs="mvcc-repl-sync.xml mvcc-repl-sync-br.xml mvcc-repl-async.xml"
- doLoop $product
-}
-
-jbc220()
-{
- #### JBoss Cache 2.2.0
- product="jbosscache-2.2.0"
- configs="pess-repl-sync.xml pess-repl-sync-br.xml pess-repl-async.xml"
- doLoop $product
-}
-
-ehcache()
-{
- #### EHCache
- product="ehcache-1.5.0"
- configs="ehcache-repl-sync.xml ehcache-repl-async.xml"
- doLoop $product
-}
-
-coherence()
-{
- #### Coherence
- product="coherence-3.3.1"
- configs="repl-cache.xml dist-cache.xml"
- doLoop $product
-}
-
-startTime=`date +%s`
-configs="" # This is global and accessible by all functions.
-
-if [ -e "output" ]
-then
- mv output output`date +%s`.old
-fi
-mkdir output
-
-# jbc300
-# jbc220
-# ehcache
-coherence
-echo Generating charts ...
-
-./generateChart.sh -reportDir output
-
-endTime=`date +%s`
-minsTaken=`echo "scale=4;($endTime - $startTime)/60" | bc`
-
-echo -----
-echo -----
-echo Took $minsTaken minutes to run!
-echo -----
-echo -----
-
Copied: benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/src/org)
Modified: benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/cluster/Message.java
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/src/org/cachebench/cluster/Message.java 2009-04-29 22:08:39 UTC (rev 8024)
+++ benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/cluster/Message.java 2009-04-30 11:21:09 UTC (rev 8027)
@@ -1,7 +1,6 @@
package org.cachebench.cluster;
import java.io.Serializable;
-import java.net.SocketAddress;
import java.net.InetSocketAddress;
/**
Modified: benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/cluster/Transport.java
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/src/org/cachebench/cluster/Transport.java 2009-04-29 22:08:39 UTC (rev 8024)
+++ benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/cluster/Transport.java 2009-04-30 11:21:09 UTC (rev 8027)
@@ -2,7 +2,6 @@
import org.cachebench.config.ClusterConfig;
-import java.util.Properties;
import java.util.Map;
/**
Modified: benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/reportgenerators/PutGetChartGenerator.java
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/src/org/cachebench/reportgenerators/PutGetChartGenerator.java 2009-04-29 22:08:39 UTC (rev 8024)
+++ benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/reportgenerators/PutGetChartGenerator.java 2009-04-30 11:21:09 UTC (rev 8027)
@@ -104,7 +104,6 @@
chart.setBorderVisible(true);
chart.setAntiAlias(true);
- chart.setTextAntiAlias(true);
chart.setBackgroundPaint(new Color(0x61, 0x9e, 0xa1));
return chart;
}
Modified: benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/reportgenerators/ThroughputChartGenerator.java
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/src/org/cachebench/reportgenerators/ThroughputChartGenerator.java 2009-04-29 22:08:39 UTC (rev 8024)
+++ benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/reportgenerators/ThroughputChartGenerator.java 2009-04-30 11:21:09 UTC (rev 8027)
@@ -65,7 +65,6 @@
chart.addSubtitle(getSubtitle());
chart.setBorderVisible(true);
chart.setAntiAlias(true);
- chart.setTextAntiAlias(true);
chart.setBackgroundPaint(new Color(0x61, 0x9e, 0xa1));
return chart;
}
Modified: benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/smartfrog/CacheBenchmarkPrim.java
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/src/org/cachebench/smartfrog/CacheBenchmarkPrim.java 2009-04-29 22:08:39 UTC (rev 8024)
+++ benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/smartfrog/CacheBenchmarkPrim.java 2009-04-30 11:21:09 UTC (rev 8027)
@@ -8,9 +8,6 @@
//import org.smartfrog.sfcore.prim.PrimImpl;
//import org.smartfrog.sfcore.prim.TerminationRecord;
-import java.io.*;
-import java.rmi.RemoteException;
-
/**
* @author Mircea.Markus at jboss.com
*/
Deleted: benchmarks/benchmark-fwk/branches/mavenized/generateChart.sh
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/generateChart.sh 2009-04-30 11:20:46 UTC (rev 8026)
+++ benchmarks/benchmark-fwk/branches/mavenized/generateChart.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-CP=.:classes/production/Framework:./conf
-
-for i in lib/*.jar
-do
- CP=$CP:$i
-done
-
-java -cp $CP org.cachebench.reportgenerators.ChartGenerator ${*}
Deleted: benchmarks/benchmark-fwk/branches/mavenized/infinispan.sh
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/infinispan.sh 2009-04-30 11:20:46 UTC (rev 8026)
+++ benchmarks/benchmark-fwk/branches/mavenized/infinispan.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-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
-
-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
-
-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.sh -reportDir output
Deleted: benchmarks/benchmark-fwk/branches/mavenized/jvm_params.sh
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/jvm_params.sh 2009-04-30 11:20:46 UTC (rev 8026)
+++ benchmarks/benchmark-fwk/branches/mavenized/jvm_params.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-### sets the JVM params for the instance that triggers test runnings
-export JVM_XMS=256m
-export JVM_XMX=1024m
\ No newline at end of file
Deleted: benchmarks/benchmark-fwk/branches/mavenized/killNode.sh
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/killNode.sh 2009-04-30 11:20:46 UTC (rev 8026)
+++ benchmarks/benchmark-fwk/branches/mavenized/killNode.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-##################################################################################
-#
-# This script allows you to kill benchmark runner instances started with runNode.sh
-#
-##################################################################################
-
-ps -elf | grep cacheBenchFwk.cacheWrapperClassName | grep -v grep | cut -c 14-20 | xargs -r kill -9
-ps -elf | grep allJBossCacheTests.sh | grep -v grep | cut -c 14-20 | xargs -r kill -9
-ps -elf | grep /runNode.sh | grep -v grep | cut -c 14-20 | xargs -r kill -9
-exit 0
\ No newline at end of file
Deleted: benchmarks/benchmark-fwk/branches/mavenized/runAllLocal.sh
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/runAllLocal.sh 2009-04-30 11:20:46 UTC (rev 8026)
+++ benchmarks/benchmark-fwk/branches/mavenized/runAllLocal.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-for jdk in java5 java6 ; do
-source ${jdk}
-#jdk=java5
-rm -rf ./output/*
-
-export PLAIN_JVM_OPTIONS="${JVM_OPTIONS} -DcacheBenchFwk.fwkCfgFile=cachebench-local.xml -Xms2g -Xmx2g"
-unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)"
-./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RC.xml
-unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)"
-./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RR.xml
-unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(4.0.0.ALPHA2)"
-./runLocalNode.sh infinispan-4.0.0 local-RC.xml
-unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(4.0.0.ALPHA2)"
-./runLocalNode.sh infinispan-4.0.0 local-RR.xml
-unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)"
-./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RC-FIFO.xml
-unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)"
-./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RR-FIFO.xml
-unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(4.0.0.ALPHA2)"
-./runLocalNode.sh infinispan-4.0.0 local-RC-FIFO.xml
-unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(4.0.0.ALPHA2)"
-./runLocalNode.sh infinispan-4.0.0 local-RR-FIFO.xml
-
-
-mkdir output
-mv data* ./output
-
-./generateChart.sh -reportDir output -o LocalMode-${jdk} -chartType putget
-
-done
-
Deleted: benchmarks/benchmark-fwk/branches/mavenized/runAllLocalEH.sh
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/runAllLocalEH.sh 2009-04-30 11:20:46 UTC (rev 8026)
+++ benchmarks/benchmark-fwk/branches/mavenized/runAllLocalEH.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-for jdk in java5 java6 ; do
-source ${jdk}
-#jdk=java5
-rm -rf ./output/*
-
-export PLAIN_JVM_OPTIONS="${JVM_OPTIONS} -DcacheBenchFwk.fwkCfgFile=cachebench-local.xml -Xms2g -Xmx2g"
-unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)"
-./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RC.xml
-unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(4.0.0.ALPHA2)"
-./runLocalNode.sh infinispan-4.0.0 local-RC.xml
-
-
-mkdir output
-mv data* ./output
-
-./generateChart.sh -reportDir output -o LocalMode-${jdk} -chartType putget
-
-done
-
Deleted: benchmarks/benchmark-fwk/branches/mavenized/runLocalNode.sh
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/runLocalNode.sh 2009-04-30 11:20:46 UTC (rev 8026)
+++ benchmarks/benchmark-fwk/branches/mavenized/runLocalNode.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -1,61 +0,0 @@
-#!/bin/bash
-# author: Mircea.Markus at jboss.com
-# cygwin users: add the scripts from :pserver:anoncvs at cygwin.com:/cvs/cygwin-apps/wrappers/java to the $cygwin_home/usr/local/bin
-# those would make an automatic conversion from unix CLASSPATH to win classpath, needed when executing java -cp
-
-preferIPv4Stack=true
-DEBUG=debug
-CACHE_PRODUCT=${1}
-TEST_CFG=${2}
-hostname=`hostname`
-PIDFILE=PID.${hostname}.pid
-
-if [ -z $1 ]
-then
- echo Usage:
- echo
- echo ./runNode.sh [cache product to test] [test config file]
- echo param [cache product to test] : must be one of the directories names under './cache-products'
- echo param [test config file] : configuration file to use with the cache product. Typically resides in './cache-products/XXX/conf/'
- echo
- echo Example: './runNode.sh jbosscache-2.0.0 repl_async.xml' will start the 1st node running an instance of jbc2.0.0 in standalone [LOCAL] mode using the repl_async configuration.
- exit 1
-fi
-
-#libraries needed by the fwk, add them to the classpath
-for JAR in ./lib/*
-do
- CLASSPATH=$CLASSPATH:$JAR
-done
-
-export CLASSPATH=$CLASSPATH:./conf:./classes/production/Framework
-
-configFile=./cache-products/${CACHE_PRODUCT}/config.sh
-
-#first check whether the config file exists and load it
-if [ -f ${configFile} ]
-then
- . ${configFile}
- echo Calling ${configFile} exit code is $?
-else
- echo could not find config file ${configFile}, aborting!
- exit 2
-fi
-
-#. ./bindAddress.sh
-#echo bind address exit code is $?
-
-JVM_OPTIONS="${JVM_OPTIONS} -DcacheBenchFwk.cacheProductName=${CACHE_PRODUCT} -DcacheBenchFwk.cacheConfigFile=${TEST_CFG} -Djava.net.preferIPv4Stack=${preferIPv4Stack} -DlocalOnly=true"
-TO_EXECUTE="java $JVM_OPTIONS -cp $CLASSPATH org.cachebench.CacheBenchmarkRunner"
-
-if [ "$DEBUG" = "debug" ]
-then
- echo Executing:
- echo ${TO_EXECUTE}
- echo
-fi
-
-${TO_EXECUTE}
-echo $!>${PIDFILE}
-echo "Return code from benchmark runner is $?"
-
Deleted: benchmarks/benchmark-fwk/branches/mavenized/runNode.sh
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/runNode.sh 2009-04-30 11:20:46 UTC (rev 8026)
+++ benchmarks/benchmark-fwk/branches/mavenized/runNode.sh 2009-04-30 11:21:09 UTC (rev 8027)
@@ -1,72 +0,0 @@
-#!/bin/bash
-# author: Mircea.Markus at jboss.com
-# cygwin users: add the scripts from :pserver:anoncvs at cygwin.com:/cvs/cygwin-apps/wrappers/java to the $cygwin_home/usr/local/bin
-# those would make an automatic conversion from unix CLASSPATH to win classpath, needed when executing java -cp
-# todo mmarkus - add another configuration file to set all the jvm params, which should be called by this one (phps benchmatrk-jvm.sh)
-# todo mmarkus - move the scripts in an bin directory as there are more and more scrips now
-# todo mmarkus - if allJbossCacheTests.sh is launched with nohup it does not work, make that work
-
-preferIPv4Stack=true
-DEBUG=debug
-CURRENT_INDEX=${1}
-CACHE_PRODUCT=${2}
-TEST_CFG=${3}
-CLUSTER_SIZE=${4}
-hostname=`hostname`
-PIDFILE=PID.${hostname}.pid
-
-if [ -z $1 ]
-then
- echo Usage:
- echo
- echo ./runNode.sh [current node index] [cache product to test] [test config file] [cluster size]
- echo param [current node index] : the index of this node in the list of nodes in the cluster [0 .. <cluster size> - 1]
- echo param [cache product to test] : must be one of the directories names under './cache-products'
- echo param [test config file] : configuration file to use with the cache product. Typically resides in './cache-products/XXX/conf/'
- echo param [cluster size] : total number of nodes that will run tests.
- echo
- echo Example: './runNode.sh 0 jbosscache-2.2.0 pess-repl-sync.xml 3' will start the 1st node running an instance of jbc2.0.0 on a cluster made out of 3 nodes, using the repl_async configuration.
- exit 1
-fi
-
-#libraries needed by the fwk, add them to the classpath
-for JAR in ./lib/*
-do
- CLASSPATH=$CLASSPATH:$JAR
-done
-
-export CLASSPATH=$CLASSPATH:./conf:./classes/production/Framework
-
-configFile=./cache-products/${CACHE_PRODUCT}/config.sh
-
-#first check whether the config file exists and load it
-if [ -f ${configFile} ]
-then
- . ${configFile}
- echo Calling ${configFile} exit code is $?
-else
- echo could not find config file ${configFile}, aborting!
- exit 2
-fi
-
-. ./bindAddress.sh
-. ./jvm_params.sh
-
-JVM_OPTIONS="${JVM_OPTIONS} -Xms${JVM_XMS} -Xmx${JVM_XMX} -DcacheBenchFwk.cacheProductName=${CACHE_PRODUCT} -Dbind.address=${BIND_ADDRESS} -DcacheBenchFwk.cacheConfigFile=${TEST_CFG} -DcurrentIndex=${CURRENT_INDEX} -DclusterSize=${CLUSTER_SIZE} -Djava.net.preferIPv4Stack=${preferIPv4Stack}"
-
-# 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"
-
-if [ "$DEBUG" = "debug" ]
-then
- echo Executing:
- echo ${TO_EXECUTE}
- echo
-fi
-
-${TO_EXECUTE}
-#echo $!>${PIDFILE}
-echo "Return code from benchmark runner is $?"
-
More information about the jbosscache-commits
mailing list