[jboss-svn-commits] JBL Code SVN: r33776 - labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts.

[jboss-svn-commits at lists.jboss.org]

Author: whitingjr
Date: 2010-07-08 09:46:38 -0400 (Thu, 08 Jul 2010)
New Revision: 33776

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.properties
   labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-commands.xml
Log:
Changed to call the server stop script.
Removes the large messages directory.

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-08 13:10:29 UTC (rev 33775)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.properties	2010-07-08 13:46:38 UTC (rev 33776)
@@ -8,5 +8,4 @@
 
 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-08 13:10:29 UTC (rev 33775)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml	2010-07-08 13:46:38 UTC (rev 33776)
@@ -21,7 +21,12 @@
 
    <property file="build-api.properties" />
 
+   <taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask"/>
+   <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
    
+   <property environment="env"/>
+   <property name="framework.properties.dir" location="${env.USER_HOME}/.specjms" />
+   <property name="framework.file" location="${framework.properties.dir}/framework.properties" />
 
    <target name="clean">
       <echo>Removing prior run collected data.</echo>
@@ -37,6 +42,15 @@
       <echo>Waiting some time to allow the server to startup.</echo>
       <sleep seconds="180"/>
    </target>
+   
+   <target name="stop-eap-server">
+      <echo>Stopping EAP server.</echo>
+      <sshexec host="hornetq"
+         username="root"
+         password="${r_p}"
+         command="/root/apache-ant-1.7.1/bin/ant -buildfile /root/java/batch-execution-SPEC-jms2007/scripts/server-controller/server-commands.xml stop"/>
+   </target>
+   
 
    <target name="gather-configuration" depends="clean">
       <echo>Gathering configuration located on EAP server.</echo>
@@ -79,15 +93,31 @@
    
    <target name="process-gc-stats">
       <echo>Processing gc stats</echo>
-      <sshexec host="jmsclient1"
-         username="root"
-         password="${r_p}"
-         command="${process.gc.log.command}"/>
+      <exec executable="printgcstats" output="${spec.install.dir}/config/verbose-gc-stats.txt">
+         <arg value="-v"/>
+         <arg value="cpus=16"/>
+         <arg value="${spec.install.dir}/config/verbose-gc.txt"/>
+      </exec>
    </target>
+   
+   <target name="submission-preparation">
+      <message echo="Preparing the submission files with values used during the benchmark run."/>
+      
+   </target>
 
    <target name="generate-submission">
+      
+      
+   </target>
+   
+   <target name="generate-submission-report">
       <echo>Generating submission</echo>
+      <xmltask source="${spec.install.dir}/output/ /specjms-result.xml">
+         <copy path="/:configuration/:journal-directory/text()" property="hornetq.journal.dir"/>
+      </xmltask>
    </target>
+   
+   
 
    
    <target name="usage">

Modified: labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-commands.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-commands.properties	2010-07-08 13:10:29 UTC (rev 33775)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-commands.properties	2010-07-08 13:46:38 UTC (rev 33776)
@@ -1,4 +1,4 @@
+benchmark.run.duration.inMinutes=55
 
 
 
-

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-08 13:10:29 UTC (rev 33775)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-commands.xml	2010-07-08 13:46:38 UTC (rev 33776)
@@ -22,10 +22,13 @@
 		<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"/>
-	   <sleep minutes="55"/>
+	   <echo>Waiting ${benchmark.run.duration.inMinutes} minutes to allow the benchmark to complete.</echo>
+	   <sleep minutes="${benchmark.run.duration.inMinutes}"/>
+	   <ant antfile="build-api.xml" target="stop-eap-server"/>
 	   <ant antfile="build-api.xml" target="gather-logs"/>
 	   <ant antfile="build-api.xml" target="process-gc-stats"/>
-	   <ant antfile="build-api.xml" target=""/>
+	   
+	   <ant antfile="build-api.xml" target="generate-submission"/>
 	</target>
 	
 	<target name="usage">