Commit 8ca6dbcd authored by Krzysztof Karas's avatar Krzysztof Karas Committed by Jim Harris
Browse files

test/json_config: commonize functions 



Commonize some of the functions to avoid code duplication.

Change-Id: I4ec1af2b803f9776e78f6f697dcba9739795d79b
Signed-off-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/21259


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent c8704204

test/json_config/common.sh

0 → 100644
+63 −0
Original line number Diff line number Diff line 
#  SPDX-License-Identifier: BSD-3-Clause

#  Copyright (C) 2024 Intel Corporation

#  All rights reserved.

#



# $1 - target

# $2..$n app parameters

function json_config_test_start_app() {

	local app=$1

	shift



	[[ -n "${#app_socket[$app]}" ]] # Check app type

	[[ -z "${app_pid[$app]}" ]]     # Assert if app is not running



	local app_extra_params=""

	if [[ $SPDK_TEST_VHOST -eq 1 || $SPDK_TEST_VHOST_INIT -eq 1 ]]; then

		# If PWD is nfs/sshfs we can't create UNIX sockets there. Always use safe location instead.

		app_extra_params='-S /var/tmp'

	fi



	$SPDK_BIN_DIR/spdk_tgt ${app_params[$app]} ${app_extra_params} -r ${app_socket[$app]} "$@" &

	app_pid["$app"]=$!



	echo "Waiting for $app to run..."

	waitforlisten ${app_pid[$app]} ${app_socket[$app]}

	echo ""

}



# $1 - target / initiator

function json_config_test_shutdown_app() {

	local app=$1



	# Check app type && assert app was started

	[[ -n "${#app_socket[$app]}" ]]

	[[ -n "${app_pid[$app]}" ]]



	# spdk_kill_instance RPC will trigger ASAN

	kill -SIGINT ${app_pid[$app]}



	for ((i = 0; i < 30; i++)); do

		if ! kill -0 ${app_pid[$app]} 2> /dev/null; then

			app_pid["$app"]=

			break

		fi

		sleep 0.5

	done



	if [[ -n "${app_pid[$app]}" ]]; then

		echo "SPDK $app shutdown timeout"

		return 1

	fi



	echo "SPDK $app shutdown done"

}



on_error_exit() {

	set -x

	set +e

	print_backtrace

	trap - ERR

	echo "Error on $1 - $2"

	exit 1

}

test/json_config/json_config.sh

+1 −60
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
rootdir=$(readlink -f $(dirname $0)/../..)

source "$rootdir/test/common/autotest_common.sh"

source "$rootdir/test/nvmf/common.sh"

source "$rootdir/test/json_config/common.sh"



if [[ $SPDK_TEST_ISCSI -eq 1 ]]; then

	source "$rootdir/test/iscsi_tgt/common.sh"
@@ -92,56 +93,6 @@ function tgt_check_notifications() { 
	INFO

}



# $1 - target / initiator

# $2..$n app parameters

function json_config_test_start_app() {

	local app=$1

	shift



	[[ -n "${#app_socket[$app]}" ]] # Check app type

	[[ -z "${app_pid[$app]}" ]]     # Assert if app is not running



	local app_extra_params=""

	if [[ $SPDK_TEST_VHOST -eq 1 || $SPDK_TEST_VHOST_INIT -eq 1 ]]; then

		# If PWD is nfs/sshfs we can't create UNIX sockets there. Always use safe location instead.

		app_extra_params='-S /var/tmp'

	fi



	$SPDK_BIN_DIR/spdk_tgt ${app_params[$app]} ${app_extra_params} -r ${app_socket[$app]} "$@" &

	app_pid[$app]=$!



	echo "Waiting for $app to run..."

	waitforlisten ${app_pid[$app]} ${app_socket[$app]}

	echo ""

}



# $1 - target / initiator

function json_config_test_shutdown_app() {

	local app=$1



	# Check app type && assert app was started

	[[ -n "${#app_socket[$app]}" ]]

	[[ -n "${app_pid[$app]}" ]]



	# spdk_kill_instance RPC will trigger ASAN

	kill -SIGINT ${app_pid[$app]}



	for ((i = 0; i < 30; i++)); do

		if ! kill -0 ${app_pid[$app]} 2> /dev/null; then

			app_pid[$app]=

			break

		fi

		sleep 0.5

	done



	if [[ -n "${app_pid[$app]}" ]]; then

		echo "SPDK $app shutdown timeout"

		return 1

	fi



	echo "SPDK $app shutdown done"

}



function create_accel_config() {

	timing_enter "${FUNCNAME[0]}"
@@ -405,16 +356,6 @@ function json_config_clear() { 
	fi

}



on_error_exit() {

	set -x

	set +e

	print_backtrace

	trap - ERR

	echo "Error on $1 - $2"

	json_config_test_fini

	exit 1

}



trap 'on_error_exit "${FUNCNAME}" "${LINENO}"' ERR

echo "INFO: JSON configuration test init"

json_config_test_init

test/json_config/json_config_extra_key.sh

+1 −53
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
rootdir=$(readlink -f $(dirname $0)/../..)

source "$rootdir/test/common/autotest_common.sh"

source "$rootdir/test/nvmf/common.sh"

source "$rootdir/test/json_config/common.sh"



# Check that adding arbitrary top-level key to JSON SPDK config alongside

# "subsystems" doesn't break SPDK parsing that occurs when loading config
@@ -18,59 +19,6 @@ declare -A app_socket=([target]='/var/tmp/spdk_tgt.sock') 
declare -A app_params=([target]='-m 0x1 -s 1024')

declare -A configs_path=([target]="$rootdir/test/json_config/extra_key.json")



# $1 - target

# $2..$n app parameters

function json_config_test_start_app() {

	local app=$1

	shift



	[[ -n "${#app_socket[$app]}" ]] # Check app type

	[[ -z "${app_pid[$app]}" ]]     # Assert if app is not running



	$SPDK_BIN_DIR/spdk_tgt ${app_params[$app]} -r ${app_socket[$app]} "$@" &

	app_pid[$app]=$!



	echo "Waiting for $app to run..."

	waitforlisten ${app_pid[$app]} ${app_socket[$app]}

	echo ""

}



# $1 - target / initiator

function json_config_test_shutdown_app() {

	local app=$1



	# Check app type && assert app was started

	[[ -n "${#app_socket[$app]}" ]]

	[[ -n "${app_pid[$app]}" ]]



	# spdk_kill_instance RPC will trigger ASAN

	kill -SIGINT ${app_pid[$app]}



	for ((i = 0; i < 30; i++)); do

		if ! kill -0 ${app_pid[$app]} 2> /dev/null; then

			app_pid[$app]=

			break

		fi

		sleep 0.5

	done



	if [[ -n "${app_pid[$app]}" ]]; then

		echo "SPDK $app shutdown timeout"

		return 1

	fi



	echo "SPDK $app shutdown done"

}



on_error_exit() {

	set -x

	set +e

	print_backtrace

	trap - ERR

	echo "Error on $1 - $2"

	exit 1

}



trap 'on_error_exit "${FUNCNAME}" "${LINENO}"' ERR



echo "INFO: launching applications..."