[jboss-svn-commits] JBL Code SVN: r36797 - labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Mar 14 10:45:32 EDT 2011
Author: whitingjr
Date: 2011-03-14 10:45:31 -0400 (Mon, 14 Mar 2011)
New Revision: 36797
Modified:
labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/client-api.properties
labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/client-api.xml
Log:
Updated properties file with comments.
Removed unnecessary properties.
Updated properties used in Ant task file client-api.xml
Modified: labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/client-api.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/client-api.properties 2011-03-14 14:32:28 UTC (rev 36796)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/client-api.properties 2011-03-14 14:45:31 UTC (rev 36797)
@@ -1,35 +1,55 @@
#Thu Jul 01 13:05:21 BST 2010
+# installation of SPECjms2007, the installation path on every client must
+# be identical
spec.install.dir=/specjms2007
-# the commands need placing in this properties file
+# installation path of the harness, relative or full
+harness.install.dir=java/batch-execution-SPEC-jms2007
+
+# commands to be executed in the SUT on the clients, these commands call
+# the SPECjms2007 benchmark Ant tasks. Have a separate line for every satellite.
start.controller.command=nohup ${env.ANT_HOME}/bin/ant -buildfile ${spec.install.dir}/build.xml startController -Dcontroller.host=jmsclient1 > /tmp/controller.txt &
start.satellite.one=nohup ${env.ANT_HOME}/bin/ant -buildfile ${spec.install.dir}/build.xml startSatellite -Dcontroller.host=jmsclient1 > /tmp/satellite-jmsclient1.txt &
start.satellite.two=nohup ${env.ANT_HOME}/bin/ant -buildfile ${spec.install.dir}/build.xml startSatellite -Dcontroller.host=jmsclient1 > /tmp/satellite-jmsclient2.txt &
start.satellite.three=nohup ${env.ANT_HOME}/bin/ant -buildfile ${spec.install.dir}/build.xml startSatellite -Dcontroller.host=jmsclient1 > /tmp/satellite-jmsclient3.txt &
start.satellite.four=nohup ${env.ANT_HOME}/bin/ant -buildfile ${spec.install.dir}/build.xml startSatellite -Dcontroller.host=jmsclient1 > /tmp/satellite-jmsclient4.txt &
+# this will call the native startup command for jms server. This depends on
+# the environment property EAP_HOME having been set in the account profile.
start.eap.command=nohup ${env.EAP_HOME}/bin/run.sh -c production -b hornetq &
+# these are timeouts
+# this is the total amount of time to wait for the messaging server to start, in minutes
server.startup.sleep.inMinutes=3
+# the amount of time to wait before checking the messaging server has started, in milliseconds
server.startup.check.inMilliseconds=500
+# this is the directory path for temporary files created in a benchmark run.
temporary.directory=/tmp
-jps.output.file=/tmp/jpsProgram.pid
+# path of a temporary file used to store the pid of the server process.
+jps.output.file=${temporary.directory}/jpsProgram.pid
+# arguments passed to the jstat tool. These output the gc behaviour of the jms server
start.jstat.1=jstat -gcutil -t -h12
+# further arguments passed to the jstat tool to redirect output to a .txt file
start.jstat.2=5s > ${env.EAP_HOME}/server/production/log/jstat-hornetq.txt &
-server.deployment.dir=${env.EAP_HOME}
-
+# the jvm process name of the ControllerDriver
benchmark.process.name=SPECjmsControlDriver
+# the wait period between checking the benchmark has stopped, in milliseconds
completion.wait.period.inMilliSeconds=60000
+# the wait period after the harness has called the benchmark start commands for controller and satellite(s)
wait.benchmark.startup.period.inSeconds=25
+# the url to use for checking the jms server has completed startup
waitfor.eap.url=http://hornetq:8080/index.html
+# a temporary file that is used to store timestamps
timestamp.file.name=run-start.properties
-jms.raw.file=/tmp/jms.txt
-jms.output.file=/tmp/jms.properties
\ No newline at end of file
+# temporary file path that stores raw output, not currently used
+jms.raw.file=${temporary.directory}/jms.txt
+# path location of a temporary file that holds the properties used in the benchmark run, not currently used
+jms.output.file=${temporary.directory}/jms.properties
Modified: labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/client-api.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/client-api.xml 2011-03-14 14:32:28 UTC (rev 36796)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/client-api.xml 2011-03-14 14:45:31 UTC (rev 36797)
@@ -84,13 +84,13 @@
<sshexec host="${eap.server.host}"
username="${eap.server.username}"
password="${eap.server.password}"
- command="/usr/share/ant/v1.7.1/bin/ant -buildfile java/batch-execution-SPEC-jms2007/scripts/server-controller/server-commands.xml stop"/>
+ command="/usr/share/ant/v1.7.1/bin/ant -buildfile ${harness.install.dir}/scripts/server-controller/server-commands.xml stop"/>
</target>
<target name="gather-configuration" depends="clean">
<echo>Gathering configuration located on EAP server.</echo>
- <scp remotefile="${eap.server.username}@${eap.server.host}:${server.deployment.dir}/bin/run.conf" localTodir="${spec.install.dir}/config/run.conf" failonerror="true" password="${eap.server.password}"/>
- <scp remotefile="${eap.server.username}@${eap.server.host}:${server.deployment.dir}/server/production/deploy/hornetq/hornetq-configuration.xml" localTodir="${spec.install.dir}/config/hornetq-configuration.xml" failonerror="false" password="${eap.server.password}"/>
+ <scp remotefile="${eap.server.username}@${eap.server.host}:${env.EAP_HOME}/bin/run.conf" localTodir="${spec.install.dir}/config/run.conf" failonerror="true" password="${eap.server.password}"/>
+ <scp remotefile="${eap.server.username}@${eap.server.host}:${env.EAP_HOME}/server/production/deploy/hornetq/hornetq-configuration.xml" localTodir="${spec.install.dir}/config/hornetq-configuration.xml" failonerror="false" password="${eap.server.password}"/>
</target>
<target name="start-benchmark">
@@ -119,6 +119,10 @@
username="${benchmark.client.01.username}"
password="${benchmark.client.01.password}"
command="${start.controller.command}"/>
+ <!-- HARDCODED
+ Depending on the number of clients in the SUT add or remove lines. Ensure
+ the properties files has an entry for the executed command.
+ -->
<echo>start satellite1</echo>
<sshexec host="${benchmark.client.01.host}"
username="${benchmark.client.01.username}"
@@ -148,9 +152,9 @@
<target name="gather-logs">
<echo>Gathering log files</echo>
<parallel failonany="false">
- <scp remotefile="${eap.server.username}@${eap.server.host}:${server.deployment.dir}/server/production/log/jstat-hornetq.txt" localTodir="${spec.install.dir}/output/${org.spec.internal.runId}/config/jstat-hornetq.txt" failonerror="false" password="${eap.server.password}"/>
+ <scp remotefile="${eap.server.username}@${eap.server.host}:${env.EAP_HOME}/server/production/log/jstat-hornetq.txt" localTodir="${spec.install.dir}/output/${org.spec.internal.runId}/config/jstat-hornetq.txt" failonerror="false" password="${eap.server.password}"/>
<scp remotefile="${eap.server.username}@${eap.server.host}:/tmp/verbose-gc.txt" localTodir="${spec.install.dir}/output/${org.spec.internal.runId}/config/verbose-gc.txt" failonerror="false" password="${eap.server.password}"/>
- <scp remotefile="${eap.server.username}@${eap.server.host}:${server.deployment.dir}/server/production/log/server.log" localTodir="${spec.install.dir}/output/${org.spec.internal.runId}/config/server.log" failonerror="false" password="${eap.server.password}"/>
+ <scp remotefile="${eap.server.username}@${eap.server.host}:${env.EAP_HOME}/server/production/log/server.log" localTodir="${spec.install.dir}/output/${org.spec.internal.runId}/config/server.log" failonerror="false" password="${eap.server.password}"/>
</parallel>
</target>
@@ -366,7 +370,7 @@
<echo>Deploying run.conf</echo>
<antcall target="substitute-remote-config">
<param name="replacement.file.source.name" value= "${payload.dir}/run.conf"/>
- <param name="replacement.file.target.name" value= "${server.deployment.dir}/bin/run.conf"/>
+ <param name="replacement.file.target.name" value= "${env.EAP_HOME}/bin/run.conf"/>
</antcall>
</then>
</if>
@@ -377,7 +381,7 @@
<echo>Deploying libHornetQAIO64.so</echo>
<antcall target="substitute-remote-config">
<param name="replacement.file.source.name" value= "${payload.dir}/libHornetQAIO64.so"/>
- <param name="replacement.file.target.name" value= "${server.deployment.dir}/native/lib64/libHornetQAIO64.so"/>
+ <param name="replacement.file.target.name" value= "${env.EAP_HOME}/native/lib64/libHornetQAIO64.so"/>
</antcall>
</then>
</if>
@@ -388,7 +392,7 @@
<echo>Deploying hornetq-jms.xml</echo>
<antcall target="substitute-remote-config">
<param name="replacement.file.source.name" value= "${payload.dir}/hornetq-jms.xml"/>
- <param name="replacement.file.target.name" value= "${server.deployment.dir}/server/production/deploy/hornetq/hornetq-jms.xml"/>
+ <param name="replacement.file.target.name" value= "${env.EAP_HOME}/server/production/deploy/hornetq/hornetq-jms.xml"/>
</antcall>
</then>
</if>
@@ -399,7 +403,7 @@
<echo>Deploying hornetq-jms.xml</echo>
<antcall target="substitute-remote-config">
<param name="replacement.file.source.name" value= "${payload.dir}/hornetq-configuration.xml"/>
- <param name="replacement.file.target.name" value= "${server.deployment.dir}/server/production/deploy/hornetq/hornetq-configuration.xml"/>
+ <param name="replacement.file.target.name" value= "${env.EAP_HOME}/server/production/deploy/hornetq/hornetq-configuration.xml"/>
</antcall>
</then>
</if>
@@ -410,18 +414,18 @@
<echo>Deploying jms-ds.xml</echo>
<antcall target="substitute-remote-config">
<param name="replacement.file.source.name" value= "${payload.dir}/jms-ds.xml"/>
- <param name="replacement.file.target.name" value= "${server.deployment.dir}/server/production/deploy/hornetq/jms-ds.xml"/>
+ <param name="replacement.file.target.name" value= "${env.EAP_HOME}/server/production/deploy/hornetq/jms-ds.xml"/>
</antcall>
</then>
</if>
<if>
- <available file="${payload.dir}/build-commands.properties"/>
+ <available file="${payload.dir}/client-commands.properties"/>
<then>
- <echo>Deploying build-commands.properties</echo>
+ <echo>Deploying client-commands.properties</echo>
<antcall target="substitute-local-config">
- <param name="replacement.file.source.name" value= "${payload.dir}/build-commands.properties"/>
- <param name="replacement.file.target.name" value= "java/batch-execution-SPEC-jms2007/scripts/build-commands.properties"/>
+ <param name="replacement.file.source.name" value= "${payload.dir}/client-commands.properties"/>
+ <param name="replacement.file.target.name" value= "${harness.install.dir}/scripts/client-commands.properties"/>
</antcall>
</then>
</if>
@@ -650,7 +654,7 @@
</target>
<target name="usage">
- <echo>usage: Do not call this directly, instead use build-commands</echo>
+ <echo>usage: Do not call this directly, instead use client-commands</echo>
</target>
</project>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list