From ef6832ef5684642162f29e2e2daf81d0b953909f Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Thu, 2 May 2019 01:18:13 -0700 Subject: [PATCH] test/nvme: kill stub with -9 when a failure occurs This ensures the stub gets killed so that we can make forward progress on collecting a backtrace. This requires adding an optional parameter to the kill_stub function to specify a signal. Signed-off-by: Jim Harris Change-Id: Ib46d07b6651c6f35382f38c97901def03f28289d Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/452891 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Shuhei Matsumoto Reviewed-by: Darek Stojaczyk --- test/common/autotest_common.sh | 2 +- test/nvme/nvme.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh index e12413643..63ec56984 100644 --- a/test/common/autotest_common.sh +++ b/test/common/autotest_common.sh @@ -506,7 +506,7 @@ function start_stub() { } function kill_stub() { - kill $stubpid + kill $1 $stubpid wait $stubpid rm -f /var/run/spdk_stub0 # Re-enable ASLR now that we are done with multi-process testing diff --git a/test/nvme/nvme.sh b/test/nvme/nvme.sh index c86570afd..9264886b8 100755 --- a/test/nvme/nvme.sh +++ b/test/nvme/nvme.sh @@ -89,7 +89,7 @@ fi if [ `uname` = Linux ]; then start_stub "-s 4096 -i 0 -m 0xF" - trap "kill_stub; exit 1" SIGINT SIGTERM EXIT + trap "kill_stub -9; exit 1" SIGINT SIGTERM EXIT fi if [ $RUN_NIGHTLY -eq 1 ]; then