Commit 1819d49e authored by Krzysztof Karas's avatar Krzysztof Karas Committed by Tomasz Zawadzki
Browse files

sw_hotplug: run the hotplug in the background 



Currently we run the remove_attach_helper() function
in the background and hotplug application in the
foreground - if hotplug hangs unexpectedly, the whole
script will freeze.

This patch pushes hotplug to run in background to ensure
the control over the whole test is on sw_hotplug.sh
script's side. This way we can enforce a timeout and
stop the execution.

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent a252cf7c

test/nvme/sw_hotplug.sh

+20 −10
Original line number Diff line number Diff line
@@ -6,11 +6,6 @@ source $rootdir/scripts/common.sh 
source $rootdir/test/common/autotest_common.sh



# Pci bus hotplug

cleanup() {

	[[ -e /proc/$hotplug_pid/status ]] || return 0

	kill "$hotplug_pid"

}



# Helper function to remove/attach cotrollers

remove_attach_helper() {

	local hotplug_events=$1
@@ -72,17 +67,32 @@ remove_attach_helper() { 
}



run_hotplug() {

	trap "cleanup" EXIT



	remove_attach_helper "$hotplug_events" "$hotplug_wait" false &

	hotplug_pid=$!

	trap 'killprocess $hotplug_pid; exit 1' SIGINT SIGTERM EXIT



	"$SPDK_EXAMPLE_DIR/hotplug" \

		-i 0 \

		-t $((hotplug_events * hotplug_wait + hotplug_wait * 3)) \

		-n $((hotplug_events * nvme_count)) \

		-r $((hotplug_events * nvme_count)) \

		-l warning

		-l warning &

	hotplug_pid=$!



	remove_attach_helper "$hotplug_events" "$hotplug_wait" false



	# Wait in case hotplug app is lagging behind

	# and kill it, if it hung.

	sleep $hotplug_wait



	if ! kill -0 "$hotplug_pid"; then

		# hotplug already finished, check for the error code.

		wait "$hotplug_pid"

	else

		echo "Killing hotplug application"

		killprocess $hotplug_pid

		return 1

	fi



	trap - SIGINT SIGTERM EXIT

}



# SPDK target hotplug