[jboss-svn-commits] JBL Code SVN: r33761 - labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jul 7 12:19:21 EDT 2010
Author: whitingjr
Date: 2010-07-07 12:19:20 -0400 (Wed, 07 Jul 2010)
New Revision: 33761
Modified:
labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.properties
labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml
labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-commands.xml
Log:
Updated the scripts to handle the benchmark.
Modified: labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.properties 2010-07-07 16:18:41 UTC (rev 33760)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.properties 2010-07-07 16:19:20 UTC (rev 33761)
@@ -1,7 +1,12 @@
#Thu Jul 01 13:05:21 BST 2010
-spec.install.dir=/home/whitingjr/java/specjms2007
+spec.install.dir=/jboss-5.1.0.Branch
# the commands need placing in this properties file
start.controller.command=nohup /specjms2007/ant -buildfile /specjms2007/build.xml startController -Dcontroller.host=jmsclient1 > /tmp/controller.txt &
start.satellite.one=nohup /specjms2007/ant -buildfile /specjms2007/build.xml startSatellite -Dcontroller.host=jmsclient1 > /tmp/satellite-jmsclient1.txt &
-start.satellite.two=nohup /specjms2007/ant -buildfile /specjms2007/build.xml startSatellite -Dcontroller.host=jmsclient1 > /tmp/satellite-jmsclient2.txt &
\ No newline at end of file
+start.satellite.two=nohup /specjms2007/ant -buildfile /specjms2007/build.xml startSatellite -Dcontroller.host=jmsclient1 > /tmp/satellite-jmsclient2.txt &
+
+start.eap.command=nohup /jboss-5.1.0.Branch/bin/run.sh -c production -b hornetq &
+
+process.gc.log.command=printgcstats ${spec.install.dir}/config/verbose-gc.txt > ${spec.install.dir}/config/verbose-gc-stats.txt &
+
Modified: labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml 2010-07-07 16:18:41 UTC (rev 33760)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml 2010-07-07 16:19:20 UTC (rev 33761)
@@ -21,20 +21,48 @@
<property file="build-api.properties" />
- <!--artifact:dependencies pathId="ssh.classpath">
- <dependency groupId="junit" artifactId="junit" version="3.8.2" scope="test"/>
-
- </artifact:dependencies-->
+
<target name="clean">
<echo>Removing prior run collected data.</echo>
<delete file="config/run.conf" />
</target>
+
+ <target name="prepare-eap-server">
+ <echo>Preparing EAP server.</echo>
+ <!--sshexec host="hornetq"
+ username="root"
+ password="${r_p}"
+ command="/jboss-5.1.0.Branch/bin/shutdown.sh - -server=hornetq:1100"/>
+ <waitfor checkeveryunit="second" maxwait="20"/>
+ <sshexec host="hornetq"
+ username="root"
+ password="${r_p}"
+ command="rm -f /perf1/journal/*.hq"/>
+ <sshexec host="hornetq"
+ username="root"
+ password="${r_p}"
+ command="${start.eap.command}"/>
+ <sshexec host="hornetq"
+ username="root"
+ password="${r_p}"
+ command="jps"
+ outputproperty="jps.output"/>
+ <condition property="eap.isRunning">
+ <contains text="Main"/>
+ </condition-->
+ <sshexec host="hornetq"
+ username="root"
+ password="${r_p}"
+ command="nohup /root/java/batch-execution-SPEC-jms2007/scripts/build-commands.xml > /tmp/hornetq-node.txt"/>
+ <waitfor checkeveryunit="second" maxwait="120"/>
+ </target>
+
<target name="gather-configuration" depends="clean">
<echo>Gathering configuration located on EAP server.</echo>
- <input message="Enter root password for hornetq server:" addproperty="r_p" />
+ <!--input message="Enter root password for hornetq server:" addproperty="r_p" /-->
<scp remotefile="root at hornetq:/jboss-5.1.0.Branch/bin/run.conf" todir="${spec.install.dir}/config" failonerror="true" password="${r_p}">
</scp>
@@ -42,7 +70,7 @@
</target>
<target name="start-benchmark">
- <input message="Enter root password for jmsclientn server:" addproperty="r_p" />
+ <!--input message="Enter root password for jmsclientn server:" addproperty="r_p" /-->
<parallel failonany="true">
<echo>starting Controller</echo>
@@ -66,7 +94,30 @@
</parallel>
</target>
+
+ <target name="gather-logs">
+ <message echo="Gathering log files" />
+ <parallel failonany="false">
+ <scp remotefile="root at hornetq:/jboss-5.1.0.Branch/server/production/log/jstat-hornetq-01.txt" todir="${spec.install.dir}/config" failonerror="false" password="${r_p}"/>
+ <scp remotefile="root at hornetq:/jboss-5.1.0.Branch/server/production/log/verbose-gc.txt" todir="${spec.install.dir}/config" failonerror="false" password="${r_p}"/>
+ </parallel>
+
+ </target>
+
+ <target name="process-gc-stats">
+ <message echo="Post processing gc stats" />
+ <sshexec host="jmsclient1"
+ username="root"
+ password="${r_p}"
+ command="${process.gc.log.command}"/>
+ </target>
+ <target name="generate-submission">
+ <message echo="Generating submission" />
+
+ </target>
+
+
<target name="usage">
<message echo="usage: Do not call this directly, instead use build-commands" />
</target>
Modified: labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-commands.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-commands.xml 2010-07-07 16:18:41 UTC (rev 33760)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-commands.xml 2010-07-07 16:19:20 UTC (rev 33761)
@@ -16,11 +16,14 @@
-->
<project name="RedHat-JBoss-Performance:API" default="usage" >
- <target name="pre-benchmark-run-task" >
+ <target name="benchmark" >
<echo>Preparing for a benchmark run.</echo>
-
+ <input message="Enter root password for servers:" addproperty="r_p" />
+ <ant antfile="build-api.xml" target="prepare-eap-server"/>
<ant antfile="build-api.xml" target="gather-configuration"/>
<ant antfile="build-api.xml" target="start-benchmark"/>
+ <!--waitfor checkeveryunit="second" maxwait="55"/>
+ <ant antfile="build-api.xml" target="gather-logs"/-->
</target>
More information about the jboss-svn-commits
mailing list