diff options
| author |   Martin Klozik <martinx.klozik@intel.com> | 2016-01-11 12:58:28 +0000 |
|---|---|---|
| committer |   Maryam Tahhan <maryam.tahhan@intel.com> | 2016-01-11 13:23:40 +0000 |
| commit | f9151087699b72fea457b6c8ea6d3b1c69d70c36 (patch) | |
| tree | 37c49898e41c841d86abdc5563c9aefae0e768a1 /ci | |
| parent | 8dd24de9da39c1f863d5cf0e5a24e744fa0459d3 (diff) | |
CI: terminate hanging vsperf before its execution
In case that vsperf terminates unexpectedly, then vsperf itself
or any of executed applications might remain active. It is essential
to terminate any hanging instance of vsperf, ovs, qemu, etc.
before re-execution of vsperf itself. Otherwise vsperf will fail
again.
Change-Id: Idd65288a5171d19fcbfb907a156347eb4b645a88
JIRA: VSPERF-155
Signed-off-by: Martin Klozik <martinx.klozik@intel.com>
Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Brian Castelli <brian.castelli@spirent.com>
Reviewed-by: Gurpreet Singh <gurpreet.singh@spirent.com>
Reviewed-by: Tv Rao <tv.rao@freescale.com>
(cherry picked from commit b2b11bf301bbe37befdda23e2a0f1501c079405f)
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/build-vsperf.sh | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/ci/build-vsperf.sh b/ci/build-vsperf.sh index 13c17a78..7c847673 100755 --- a/ci/build-vsperf.sh +++ b/ci/build-vsperf.sh @@ -48,6 +48,30 @@ TESTPARAM_DAILY='--test-params pkt_sizes=64,128,512,1024,1518' # functions # +# terminate vsperf and all its utilities +# it is expected that vsperf is the only python3 app +# and no other ovs or qemu instances are running +# at CI machine +# parameters: +# none +function terminate_vsperf() { + sudo pkill stress &> /dev/null + sudo pkill python3 &> /dev/null + sudo killall -9 qemu-system-x86_64 &> /dev/null + + # sometimes qemu resists to terminate, so wait a bit and kill it again + if pgrep qemu-system-x86_64 &> /dev/null ; then + sleep 5 + sudo killall -9 qemu-system-x86_64 &> /dev/null + sleep 5 + fi + + sudo pkill ovs-vswitchd &> /dev/null + sleep 1 + sudo pkill ovsdb-server &> /dev/null + sleep 1 +} + # check and print testcase execution status # parameters: # $1 - directory with results @@ -153,8 +177,11 @@ case $1 in echo "VSPERF daily job" echo "================" + terminate_vsperf execute_vsperf OVS_with_DPDK_and_vHost_User $1 + terminate_vsperf execute_vsperf OVS_vanilla $1 + terminate_vsperf exit $EXIT ;; |