X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fstress%2Ftest_multi_sessions_per_uid_5app_streaming;h=db225db0eeda9562a587f6a394d58bd7d7b097d8;hb=HEAD;hp=eb68107d5d08b55e7f77516cdb7ac8bc99db1e0f;hpb=30d86f7d9b5b49d8e035e686b9d23c7bda805e11;p=lttng-tools.git

diff --git a/tests/stress/test_multi_sessions_per_uid_5app_streaming b/tests/stress/test_multi_sessions_per_uid_5app_streaming
index eb68107d5..8800f6f23 100755
--- a/tests/stress/test_multi_sessions_per_uid_5app_streaming
+++ b/tests/stress/test_multi_sessions_per_uid_5app_streaming
@@ -1,17 +1,12 @@
 #!/bin/bash
 #
-# Copyright (C) - 2013 David Goulet <dgoulet@efficios.com>
+# Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
 #
-# This library is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; version 2.1 of the License.  details.
+# SPDX-License-Identifier: LGPL-2.1-only
 #
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-CURDIR=$(dirname $0)/
-TESTDIR=$CURDIR/..
+CURDIR=$(dirname "$0")/
+TESTDIR="$CURDIR/.."
 LAUNCH_APP="launch_ust_app"
 SESSION_NAME="stress"
 EVENT_NAME="tp:tptest"
@@ -23,40 +18,34 @@ NR_SESSION=5
 NR_LOOP=1000
 COREDUMP_FILE=$(cat /proc/sys/kernel/core_pattern)
 NUM_TESTS=16
+APP_PIDS=()
 
 TEST_DESC="Stress test - $NR_SESSION sessions per UID streaming with $NR_APP apps"
 
-source $TESTDIR/utils/utils.sh
+# shellcheck source-path=SCRIPTDIR/../
+source "$TESTDIR/utils/utils.sh"
 
 # MUST set TESTDIR before calling those functions
 
 function enable_channel_per_uid()
 {
-    local sess_name=$1
-    local channel_name=$2
+	local sess_name=$1
+	local channel_name=$2
 
-    $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel --buffers-uid -u $channel_name -s $sess_name >/dev/null 2>&1
-    ok $? "Enable channel $channel_name per UID for session $sess_name"
-}
-
-function lttng_create_session_uri
-{
-	local name=$1
-
-	# Create session with default path
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $name -U net://localhost >/dev/null 2>&1
-	ok $? "Create session on net://localhost"
+	"$TESTDIR/../src/bin/lttng/$LTTNG_BIN" enable-channel --buffers-uid -u "$channel_name" -s "$sess_name" >/dev/null 2>&1
+	ok $? "Enable channel $channel_name per UID for session $sess_name"
 }
 
 function check_sessiond()
 {
-	if [ -z "$(pidof lt-lttng-sessiond)" ]; then
-		local str_date=$(date +%H%M%S-%d%m%Y)
+	local str_date
+	if [ -z "$(lttng_pgrep lttng-sessiond)" ]; then
+		str_date=$(date +%H%M%S-%d%m%Y)
 
 		diag "!!!The session daemon died unexpectedly!!!"
-		mv $LOG_FILE_SESSIOND $LOG_FILE_SESSIOND-$str_date
-		if [ -e $COREDUMP_FILE ]; then
-			mv $COREDUMP_FILE $COREDUMP_FILE-$str_date
+		mv $LOG_FILE_SESSIOND "$LOG_FILE_SESSIOND-$str_date"
+		if [ -e "$COREDUMP_FILE" ]; then
+			mv "$COREDUMP_FILE" "$COREDUMP_FILE-$str_date"
 		fi
 		exit 1
 	fi
@@ -64,13 +53,14 @@ function check_sessiond()
 
 function check_relayd()
 {
-	if [ -z "$(pidof lt-lttng-relayd)" ]; then
-		local str_date=$(date +%H%M%S-%d%m%Y)
+	local str_date
+	if [ -z "$(lttng_pgrep lttng-relayd)" ]; then
+		str_date=$(date +%H%M%S-%d%m%Y)
 
 		diag "!!!The relay daemon died unexpectedly!!!"
-		mv $LOG_FILE_RELAYD $LOG_FILE_RELAYD-$str_date
-		if [ -e $COREDUMP_FILE ]; then
-			mv $COREDUMP_FILE $COREDUMP_FILE-$str_date
+		mv $LOG_FILE_RELAYD "$LOG_FILE_RELAYD-$str_date"
+		if [ -e "$COREDUMP_FILE" ]; then
+			mv "$COREDUMP_FILE" "$COREDUMP_FILE-$str_date"
 		fi
 		exit 1
 	fi
@@ -78,21 +68,16 @@ function check_relayd()
 
 function start_sessiond()
 {
-	local SESSIOND_BIN="lttng-sessiond"
-
-	validate_kernel_version
-	if [ $? -ne 0 ]; then
+	if ! validate_kernel_version ; then
 		fail "Start session daemon"
 		BAIL_OUT "*** Kernel too old for session daemon tests ***"
 	fi
 
-	if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
+	if [ -z "$(lttng_pgrep 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.
-		$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_SESSIOND 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_SESSIOND 2>&1
 		status=$?
-		# Wait for sessiond to bootstrap
-		sleep 2
 		ok $status "Start session daemon"
 	fi
 }
@@ -100,37 +85,37 @@ function start_sessiond()
 function start_relayd
 {
 	local opt=$1
-	local RELAYD_BIN="lttng-relayd"
 
-	if [ -z $(pidof lt-$RELAYD_BIN) ]; then
-		$TESTDIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt >$LOG_FILE_RELAYD 2>&1 &
+	if [ -z "$(lttng_pgrep lt-$RELAYD_BIN)" ]; then
+		"$TESTDIR/../src/bin/lttng-relayd/$RELAYD_BIN" "$opt" >"$LOG_FILE_RELAYD" 2>&1 &
 		ok $? "Start lttng-relayd (opt: \"$opt\")"
 	fi
 }
 
 test_stress()
 {
+	# shellcheck disable=SC2034
 	for b in $(seq 1 $NR_LOOP); do
 		for a in $(seq 1 $NR_SESSION); do
-			lttng_create_session_uri $SESSION_NAME-$a
+			create_lttng_session_uri $SESSION_NAME-"$a" net://localhost
 			check_sessiond
 			check_relayd
-			enable_channel_per_uid $SESSION_NAME-$a $CHANNEL_NAME
+			enable_channel_per_uid $SESSION_NAME-"$a" $CHANNEL_NAME
 			check_sessiond
 			check_relayd
-			enable_ust_lttng_event $SESSION_NAME-$a $EVENT_NAME
+			enable_ust_lttng_event_ok $SESSION_NAME-"$a" $EVENT_NAME
 			check_sessiond
 			check_relayd
-			start_lttng_tracing $SESSION_NAME-$a
+			start_lttng_tracing_ok $SESSION_NAME-"$a"
 			check_sessiond
 			check_relayd
 		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_relayd
-			destroy_lttng_session $SESSION_NAME-$a
+			destroy_lttng_session_ok $SESSION_NAME-"$a"
 			check_sessiond
 			check_relayd
 		done
@@ -142,8 +127,12 @@ test_stress()
 function cleanup()
 {
 	diag "Cleaning up!"
-	killall -9 $LAUNCH_APP
+	kill -s SIGKILL "${APP_PIDS[@]}"
+	wait "${APP_PIDS[@]}" 2>/dev/null
+	APP_PIDS=()
+	# shellcheck disable=SC2119
 	stop_lttng_sessiond
+	# shellcheck disable=SC2119
 	stop_lttng_relayd
 }
 
@@ -151,10 +140,10 @@ function sighandler()
 {
 	cleanup
 	rm $LOG_FILE_SESSIOND $LOG_FILE_RELAYD
-	exit 1
+	full_cleanup
 }
 
-trap sighandler SIGINT
+trap sighandler SIGINT SIGTERM
 
 # Make sure we collect a coredump if possible.
 ulimit -c unlimited
@@ -164,7 +153,7 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp -d -t tmp.test_multi_sess_per_uid_5app_streaming.XXXXXX)
 
 start_relayd "-o $TRACE_PATH"
 start_sessiond
@@ -172,7 +161,8 @@ start_sessiond
 diag "Starting applications launcher"
 
 # Start NR_APP applications script that will spawn apps non stop.
-./$TESTDIR/stress/$LAUNCH_APP $NR_APP &
+"./$TESTDIR/stress/$LAUNCH_APP" $NR_APP &
+APP_PIDS+=(${!})
 
 test_stress
 out=$?
@@ -182,6 +172,6 @@ if [ $out -ne 0 ]; then
 fi
 
 cleanup
-rm -rf $TRACE_PATH
+rm -rf "${TRACE_PATH:?}/"
 rm $LOG_FILE_SESSIOND $LOG_FILE_RELAYD
 exit 0