projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: tests: remove killall, add missing SIGTERM handlers
[lttng-tools.git]
/
tests
/
stress
/
test_multi_sessions_per_uid_5app_streaming_kill_relayd
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 fa41b4cbb39e7269b1c18b53f5ecfcac3f1e0a96..e01e6aaf8c80906a019680e5f520bc42a4c14245 100755
(executable)
--- 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
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"
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!"
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
}
stop_lttng_sessiond
stop_lttng_relayd
}
@@
-156,6
+160,7
@@
function sighandler()
}
trap sighandler SIGINT
}
trap sighandler SIGINT
+trap sighandler SIGTERM
# Make sure we collect a coredump if possible.
ulimit -c unlimited
# 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 &
# 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 &
# 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=$?
test_stress
out=$?
This page took
0.023333 seconds
and
4
git commands to generate.