[Bigdata-commit] SF.net SVN: bigdata:[3642] branches/maven_scaleout/bigdata-integ/src/test/ resources

[<ble...@us...>]

Revision: 3642
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3642&view=rev
Author:   blevine218
Date:     2010-09-27 20:12:07 +0000 (Mon, 27 Sep 2010)

Log Message:
-----------
add ServiceStarter to the list of Java processes that might be left over and should be forcibly killed.

Modified Paths:
--------------
    branches/maven_scaleout/bigdata-integ/src/test/resources/kill_leftover_processes.sh
    branches/maven_scaleout/bigdata-integ/src/test/resources/services.xml

Modified: branches/maven_scaleout/bigdata-integ/src/test/resources/kill_leftover_processes.sh
===================================================================
--- branches/maven_scaleout/bigdata-integ/src/test/resources/kill_leftover_processes.sh	2010-09-27 20:01:43 UTC (rev 3641)
+++ branches/maven_scaleout/bigdata-integ/src/test/resources/kill_leftover_processes.sh	2010-09-27 20:12:07 UTC (rev 3642)
@@ -1,7 +1,11 @@
 #! /bin/bash
 #
-# Kill all instances of the java QuorumPeerMain process
+# Kill all instances of the java QuorumPeerMain and ServiceStarter processes.
+# This is a bit dangerous in a CI environment as we might have other build in progress
+# that have launched these Java processes.  This should suffice for the short-term though.
+#
 # TODO: Make this more generic so that we can kill processes
-#       with other names as well
+#       with other names as well.
 #
 kill `jps | grep QuorumPeerMain | cut -d' ' -f1 `
+kill `jps | grep ServiceStarter | cut -d' ' -f1 `

Modified: branches/maven_scaleout/bigdata-integ/src/test/resources/services.xml
===================================================================
--- branches/maven_scaleout/bigdata-integ/src/test/resources/services.xml	2010-09-27 20:01:43 UTC (rev 3641)
+++ branches/maven_scaleout/bigdata-integ/src/test/resources/services.xml	2010-09-27 20:12:07 UTC (rev 3642)
@@ -14,6 +14,10 @@
 
     <target name="start">
         <echo message="Starting support services..." />
+        
+        <!-- Probably overkill, but here just in case the previous run
+             failed to kill the leftover processes for some reason -->
+        <antcall target="kill-leftover-processes" />
         <antcall target="dumpProps" />
         <antcall target="startHttpd" />
         <antcall target="startLookup" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.