Author: manik.surtani(a)jboss.com
Date: 2008-01-24 08:50:41 -0500 (Thu, 24 Jan 2008)
New Revision: 5219
Modified:
benchmarks/benchmark-fwk/trunk/cluster.sh
benchmarks/benchmark-fwk/trunk/runNode.sh
Log:
Added support for user JVM params
Modified: benchmarks/benchmark-fwk/trunk/cluster.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/cluster.sh 2008-01-24 13:44:27 UTC (rev 5218)
+++ benchmarks/benchmark-fwk/trunk/cluster.sh 2008-01-24 13:50:41 UTC (rev 5219)
@@ -27,6 +27,8 @@
# Number of servers to launch on - taken from the command line.
NUM_SERVERS=${4}
+USER_JVM_PARAMS=${5}
+
COMMAND=${1}
# the DNS domain of your servers
@@ -43,7 +45,7 @@
do
server="${HOSTNAMES[idx]}"
echo Starting CacheBenchmarkFramework on host ${server}
- ssh ${SSH_USER}(a)${server}.${DOMAIN} "cd ${CACHE_BENCHMARK_HOME}
&& ./runNode.sh ${idx} ${CACHE_DIST} ${CFG_FILE} ${NUM_SERVERS}"
+ ssh ${SSH_USER}(a)${server}.${DOMAIN} "cd ${CACHE_BENCHMARK_HOME}
&& ./runNode.sh ${idx} ${CACHE_DIST} ${CFG_FILE} ${NUM_SERVERS}
${USER_JVM_PARAMS}"
sleep 2
done
;;
@@ -57,10 +59,10 @@
done
;;
*)
- echo "Usage: ${0} [start | stop] [cache distribution to test] [name of
configuration file to use] [number of servers to launch on]"
+ echo "Usage: ${0} [start | stop] [cache distribution to test] [name of
configuration file to use] [number of servers to launch on] [optional JVM params]"
echo
echo "Example:"
- echo " ${0} start jbosscache-2.0.0 repl_async.xml 6"
+ echo " ${0} start jbosscache-2.0.0 repl_async.xml 6
\"-Dbind.address=1.2.3.4 -Dxyz=abc\""
echo " ${0} stop"
echo " Note that the stop command will stop all instances on all
configured hosts"
;;
Modified: benchmarks/benchmark-fwk/trunk/runNode.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/runNode.sh 2008-01-24 13:44:27 UTC (rev 5218)
+++ benchmarks/benchmark-fwk/trunk/runNode.sh 2008-01-24 13:50:41 UTC (rev 5219)
@@ -4,12 +4,12 @@
# those would make an automatic conversion from unix CLASSPATH to win classpath, needed
when executing java -cp
preferIPv4Stack=true
-
+DEBUG=false
CURRENT_INDEX=${1}
CACHE_PRODUCT=${2}
TEST_CFG=${3}
CLUSTER_SIZE=${4}
-DEBUG=${5}
+USER_JVM_PARAMS=${5}
PIDFILE="PID.pid"
if [ -e ${PIDFILE} ]
then
@@ -29,11 +29,12 @@
then
echo Usage:
echo
- echo ./runNode.sh [current node index] [cache product to test] [test config file]
[cluster size]
+ echo ./runNode.sh [current node index] [cache product to test] [test config file]
[cluster size] [JVM params (optional)]
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 param [JVM params] : an optional extra set of parameters to be passed
to the JVM - e.g., "-Dbind.address=127.0.0.1 -Dxyz=abc"
echo
echo Example: './runNode.sh 0 jbosscache-2.0.0 repl_async.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
@@ -59,7 +60,7 @@
exit 2
fi
-JVM_OPTIONS="${JVM_OPTIONS} -DcacheBenchFwk.cacheConfigFile=${TEST_CFG}
-DcurrentIndex=${CURRENT_INDEX} -DclusterSize=${CLUSTER_SIZE}
-DcurrentIndex=${CURRENT_INDEX} -Djava.net.preferIPv4Stack=${preferIPv4Stack}"
+JVM_OPTIONS="${JVM_OPTIONS} ${USER_JVM_PARAMS}
-DcacheBenchFwk.cacheConfigFile=${TEST_CFG} -DcurrentIndex=${CURRENT_INDEX}
-DclusterSize=${CLUSTER_SIZE} -DcurrentIndex=${CURRENT_INDEX}
-Djava.net.preferIPv4Stack=${preferIPv4Stack}"
TO_EXECUTE="java $JVM_OPTIONS -cp $CLASSPATH
org.cachebench.CacheBenchmarkRunner"
if [ "$DEBUG" = "debug" ]
Show replies by date