projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test fix: test_fork can hang while waiting for child pids
[lttng-tools.git]
/
tests
/
stress
/
test_multi_sessions_per_uid_10app
diff --git
a/tests/stress/test_multi_sessions_per_uid_10app
b/tests/stress/test_multi_sessions_per_uid_10app
index c960957f216a217c1a5326911a88df0780455d06..90ef81963bfd57868726dc9682557176caae0388 100755
(executable)
--- 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)
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"
TEST_DESC="Stress test - $NR_SESSION sessions per UID with $NR_APP apps"
@@
-42,7
+43,7
@@
function enable_channel_per_uid()
function check_sessiond()
{
function check_sessiond()
{
- if [ -z "$(p
idof
lt-lttng-sessiond)" ]; then
+ if [ -z "$(p
grep --full
lt-lttng-sessiond)" ]; then
local str_date=$(date +%H%M%S-%d%m%Y)
diag "!!!The session daemon died unexpectedly!!!"
local str_date=$(date +%H%M%S-%d%m%Y)
diag "!!!The session daemon died unexpectedly!!!"
@@
-64,13
+65,11
@@
function start_sessiond()
BAIL_OUT "*** Kernel too old for session daemon tests ***"
fi
BAIL_OUT "*** Kernel too old for session daemon tests ***"
fi
- if [ -z $(p
idof
lt-$SESSIOND_BIN) ]; then
+ if [ -z $(p
grep --full
lt-$SESSIOND_BIN) ]; then
# We have to start it like this so the ulimit -c is used by this
# process. Also, we collect any error message printed out.
# We have to start it like this so the ulimit -c is used by this
# process. Also, we collect any error message printed out.
- $TESTDIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --quiet --
consumerd32-path="$TESTDIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$TESTDIR/../src/bin/lttng-consumerd/lttng-consumerd" >$LOG_FILE 2>&1 &
+ $TESTDIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --quiet --
background --consumerd32-path="$TESTDIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$TESTDIR/../src/bin/lttng-consumerd/lttng-consumerd" >$LOG_FILE 2>&1
status=$?
status=$?
- # Wait for sessiond to bootstrap
- sleep 2
ok $status "Start session daemon"
fi
}
ok $status "Start session daemon"
fi
}
@@
-79,20
+78,20
@@
test_stress()
{
for b in $(seq 1 $NR_LOOP); do
for a in $(seq 1 $NR_SESSION); do
{
for b in $(seq 1 $NR_LOOP); do
for a in $(seq 1 $NR_SESSION); do
- create_lttng_session $SESSION_NAME-$a $TRACE_PATH
+ create_lttng_session
_ok
$SESSION_NAME-$a $TRACE_PATH
check_sessiond
enable_channel_per_uid $SESSION_NAME-$a $CHANNEL_NAME
check_sessiond
check_sessiond
enable_channel_per_uid $SESSION_NAME-$a $CHANNEL_NAME
check_sessiond
- enable_ust_lttng_event $SESSION_NAME-$a $EVENT_NAME
+ enable_ust_lttng_event
_ok
$SESSION_NAME-$a $EVENT_NAME
check_sessiond
check_sessiond
- start_lttng_tracing $SESSION_NAME-$a
+ start_lttng_tracing
_ok
$SESSION_NAME-$a
check_sessiond
done
for a in $(seq 1 $NR_SESSION); do
check_sessiond
done
for a in $(seq 1 $NR_SESSION); do
- stop_lttng_tracing $SESSION_NAME-$a
+ stop_lttng_tracing
_ok
$SESSION_NAME-$a
check_sessiond
check_sessiond
- destroy_lttng_session $SESSION_NAME-$a
+ destroy_lttng_session
_ok
$SESSION_NAME-$a
check_sessiond
done
done
check_sessiond
done
done
@@
-103,7
+102,11
@@
test_stress()
function cleanup()
{
diag "Cleaning up!"
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_sessiond
}
@@
-115,6
+118,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
@@
-130,6
+134,7
@@
diag "Starting applications"
# 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} ${!}"
TRACE_PATH=$(mktemp -d)
TRACE_PATH=$(mktemp -d)
This page took
0.02887 seconds
and
4
git commands to generate.