344bb69312
Remove spdk_app_get_running_config() that allowed printing legacy configuration by the apps. Along with usr1_handler callback that was used to call that function. It was only used in iscsi_tgt so it is removed there. The app_repeat test was using SIGUSR1 to trigger a spdk_app_stop/spdk_app_start cycle. But we can use SIGTERM for that instead. While here, do a bit of cleanup in the app_repeat test app. Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Change-Id: Ie8449e8bcd979b237c68ef94f50fb7a3cb6c19db Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4750 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Paul Luse <paul.e.luse@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
48 lines
1.5 KiB
Bash
Executable File
48 lines
1.5 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
testdir=$(readlink -f $(dirname $0))
|
|
rootdir=$(readlink -f $testdir/../..)
|
|
source $rootdir/test/common/autotest_common.sh
|
|
source $rootdir/test/bdev/nbd_common.sh
|
|
|
|
function app_repeat_test() {
|
|
local rpc_server=/var/tmp/spdk-nbd.sock
|
|
local nbd_list=("/dev/nbd0" "/dev/nbd1")
|
|
local bdev_list=("Malloc0" "Malloc1")
|
|
local repeat_times=4
|
|
|
|
modprobe nbd
|
|
$rootdir/test/event/app_repeat/app_repeat -r $rpc_server -m 0x3 -t $repeat_times &
|
|
repeat_pid=$!
|
|
trap 'killprocess $repeat_pid; exit 1' SIGINT SIGTERM EXIT
|
|
echo "Process app_repeat pid: $repeat_pid"
|
|
|
|
for i in {0..2}; do
|
|
echo "spdk_app_start Round $i"
|
|
waitforlisten $repeat_pid $rpc_server
|
|
|
|
$rootdir/scripts/rpc.py -s $rpc_server bdev_malloc_create 64 4096
|
|
$rootdir/scripts/rpc.py -s $rpc_server bdev_malloc_create 64 4096
|
|
|
|
nbd_rpc_data_verify $rpc_server "${bdev_list[*]}" "${nbd_list[*]}"
|
|
# This SIGTERM is sent to the app_repeat test app - it doesn't actually
|
|
# terminate the app, it just causes it go through another
|
|
# spdk_app_stop/spdk_app_start cycle
|
|
./scripts/rpc.py -s $rpc_server spdk_kill_instance SIGTERM
|
|
done
|
|
|
|
waitforlisten $repeat_pid $rpc_server
|
|
killprocess $repeat_pid
|
|
trap - SIGINT SIGTERM EXIT
|
|
|
|
return 0
|
|
}
|
|
|
|
run_test "event_perf" $testdir/event_perf/event_perf -m 0xF -t 1
|
|
run_test "event_reactor" $testdir/reactor/reactor -t 1
|
|
run_test "event_reactor_perf" $testdir/reactor_perf/reactor_perf -t 1
|
|
|
|
if [ $(uname -s) = Linux ] && modprobe -n nbd; then
|
|
run_test "app_repeat" app_repeat_test
|
|
fi
|