From 8b0fd2fa6d5415d285f8cd2f3fc29bd3ead08fdd Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 19 Nov 2014 22:40:30 +0100 Subject: [PATCH] Fix: tests: remove killall, add missing SIGTERM handlers MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Applications may change name and, thus, be missed by using killall. Signed-off-by: Mathieu Desnoyers Signed-off-by: Jérémie Galarneau --- tests/stress/test_multi_sessions_per_uid_10app | 9 ++++++++- .../test_multi_sessions_per_uid_5app_streaming | 9 ++++++++- ...multi_sessions_per_uid_5app_streaming_kill_relayd | 12 ++++++++++-- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/tests/stress/test_multi_sessions_per_uid_10app b/tests/stress/test_multi_sessions_per_uid_10app index 365519dc6..a86b72426 100755 --- a/tests/stress/test_multi_sessions_per_uid_10app +++ b/tests/stress/test_multi_sessions_per_uid_10app @@ -24,6 +24,7 @@ NR_APP=10 NR_SESSION=5 NR_LOOP=1000 COREDUMP_FILE=$(cat /proc/sys/kernel/core_pattern) +APPS_PID= TEST_DESC="Stress test - $NR_SESSION sessions per UID with $NR_APP apps" @@ -101,7 +102,11 @@ test_stress() function cleanup() { diag "Cleaning up!" - killall -9 $LAUNCH_APP + for p in ${APPS_PID}; do + kill -s SIGKILL ${p} + wait ${p} 2>/dev/null + done + APPS_PID= stop_lttng_sessiond } @@ -113,6 +118,7 @@ function sighandler() } trap sighandler SIGINT +trap sighandler SIGTERM # Make sure we collect a coredump if possible. ulimit -c unlimited @@ -128,6 +134,7 @@ diag "Starting applications" # Start NR_APP applications script that will spawn apps non stop. ./$TESTDIR/stress/$LAUNCH_APP $NR_APP & +APPS_PID="${APPS_PID} ${!}" TRACE_PATH=$(mktemp -d) diff --git a/tests/stress/test_multi_sessions_per_uid_5app_streaming b/tests/stress/test_multi_sessions_per_uid_5app_streaming index 40c0a4d96..36a15d92e 100755 --- a/tests/stress/test_multi_sessions_per_uid_5app_streaming +++ b/tests/stress/test_multi_sessions_per_uid_5app_streaming @@ -23,6 +23,7 @@ NR_SESSION=5 NR_LOOP=1000 COREDUMP_FILE=$(cat /proc/sys/kernel/core_pattern) NUM_TESTS=16 +APPS_PID= TEST_DESC="Stress test - $NR_SESSION sessions per UID streaming with $NR_APP apps" @@ -140,7 +141,11 @@ test_stress() function cleanup() { diag "Cleaning up!" - killall -9 $LAUNCH_APP + for p in ${APPS_PID}; do + kill -s SIGKILL ${p} + wait ${p} 2>/dev/null + done + APPS_PID= stop_lttng_sessiond stop_lttng_relayd } @@ -153,6 +158,7 @@ function sighandler() } trap sighandler SIGINT +trap sighandler SIGTERM # Make sure we collect a coredump if possible. ulimit -c unlimited @@ -171,6 +177,7 @@ diag "Starting applications launcher" # Start NR_APP applications script that will spawn apps non stop. ./$TESTDIR/stress/$LAUNCH_APP $NR_APP & +APPS_PID="${APPS_PID} ${!}" test_stress out=$? diff --git a/tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd b/tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd index fa41b4cbb..e01e6aaf8 100755 --- a/tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd +++ b/tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd @@ -24,6 +24,7 @@ NR_SESSION=5 NR_LOOP=100000 COREDUMP_FILE=$(cat /proc/sys/kernel/core_pattern) NUM_TESTS=16 +APPS_PID= TEST_DESC="Stress test - $NR_SESSION sessions per UID streaming with $NR_APP apps. The relayd is killed sporadically" @@ -142,8 +143,11 @@ test_stress() function cleanup() { diag "Cleaning up!" - killall -9 $LAUNCH_APP - killall -9 $KILL_RELAYD_HELPER + for p in ${APPS_PID}; do + kill ${p} + wait ${p} 2>/dev/null + done + APPS_PID= stop_lttng_sessiond stop_lttng_relayd } @@ -156,6 +160,7 @@ function sighandler() } trap sighandler SIGINT +trap sighandler SIGTERM # Make sure we collect a coredump if possible. ulimit -c unlimited @@ -174,8 +179,11 @@ diag "Starting applications launcher" # Start NR_APP applications script that will spawn apps non stop. ./$TESTDIR/stress/$LAUNCH_APP $NR_APP & +APPS_PID="${APPS_PID} ${!}" + # Launch the helper script that will randomly kill the relayd at vitam eternam. ./$TESTDIR/stress/$KILL_RELAYD_HELPER 1 1 & +APPS_PID="${APPS_PID} ${!}" test_stress out=$? -- 2.34.1