From: <ble...@us...> - 2010-09-27 18:29:01
|
Revision: 3639 http://bigdata.svn.sourceforge.net/bigdata/?rev=3639&view=rev Author: blevine218 Date: 2010-09-27 18:28:54 +0000 (Mon, 27 Sep 2010) Log Message: ----------- add target to kill the QuorumPeerMain processes that remain after the integration tests are run. NOTE: This currently makes this part of the integration-tests Unix dependent. We might need to tune this a bit depending on supported Unix flavors. Modified Paths: -------------- branches/maven_scaleout/bigdata-integ/src/test/resources/services.xml Added Paths: ----------- branches/maven_scaleout/bigdata-integ/src/test/resources/kill_leftover_processes.sh Added: branches/maven_scaleout/bigdata-integ/src/test/resources/kill_leftover_processes.sh =================================================================== --- branches/maven_scaleout/bigdata-integ/src/test/resources/kill_leftover_processes.sh (rev 0) +++ branches/maven_scaleout/bigdata-integ/src/test/resources/kill_leftover_processes.sh 2010-09-27 18:28:54 UTC (rev 3639) @@ -0,0 +1,2 @@ +#! /bin/bash +kill `jps | grep QuorumPeerMain | cut -d' ' -f1 ` Property changes on: branches/maven_scaleout/bigdata-integ/src/test/resources/kill_leftover_processes.sh ___________________________________________________________________ Added: svn:executable + * Modified: branches/maven_scaleout/bigdata-integ/src/test/resources/services.xml =================================================================== --- branches/maven_scaleout/bigdata-integ/src/test/resources/services.xml 2010-09-27 17:53:18 UTC (rev 3638) +++ branches/maven_scaleout/bigdata-integ/src/test/resources/services.xml 2010-09-27 18:28:54 UTC (rev 3639) @@ -1,30 +1,10 @@ <project name="bigdata-integration-lookup-starter" default="help" basedir="."> -<!-- - <property name="integ.deploy.dir" location="${basedir}/.." /> - <property name="integ.app.home" location="${deploy.dir}" /> - <property name="integ.deploy.conf.dir" location="${deploy.dir}/conf" /> - <property name="integ.deploy.lib" location="${deploy.dir}/lib" /> - <property name="integ.deploy.lib.test" location="${deploy.dir}/testing/lib-test" /> - <property name="integ.deploy.lib.dl" location="${deploy.dir}/lib-dl" /> - <property name="integ.test.codebase.dir" location="${deploy.lib.dl}" /> - <property name="integ.test.codebase.port" value="23333" /> - <property name="integ.java.security.policy" location="conf/policy.all" /> - <property name="integ.log4j.configuration" location="${deploy.dir}/var/config/logging/log4j.properties" /> - <property name="integ.java.net.preferIPv4Stack" value="true" /> - <property name="integ.default.nic" value="eth0" /> - <property name="integ.parent.artifactName" value="bigdata-core" /> ---> - - <!-- Set to the empty string to indicate "unset". Application code will determine correct - default value. - <property name="integ.federation.name" value="" /> - --> - + <target name="help"> <echo level="error" message="This script must be run with either the 'start' or 'stop' targets" /> - <antcall target="dumpProps" /> + <antcall target="dumpProps" /> </target> - + <target name="dumpProps"> <echo message="Application properties:" /> <echo message="-----------------------" /> @@ -44,6 +24,7 @@ <antcall target="dumpProps" /> <antcall target="stopLookup" /> <antcall target="stopHttpd" /> + <antcall target="kill-leftover-processes" /> </target> <target name="startHttpd"> @@ -97,6 +78,16 @@ </java> </target> + <!-- Some tests currently leave processes (e.g. QuorumPeerMain) hanging around after + the tests have completed. This task kills those processes (Unix-only). --> + + <target name="kill-leftover-processes"> + <echo message="Killing leftover processes" /> + <chmod file="${basedir}/kill_leftover_processes.sh" perm="777" verbose="true" /> + <exec spawn="false" resolveexecutable="true" executable="kill_leftover_processes.sh"> + </exec> + </target> + <target name="clean-sparql-test-suite" description="delete the files unpacked by the Sesame SPARQL test suite."> <echo>"clearing: ${java.io.tmpdir}/sparql-*"</echo> <delete verbose="true"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ble...@us...> - 2010-09-27 20:12:13
|
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. |