Commit bbd36d0d authored by Ben Walker's avatar Ben Walker Committed by Tomasz Zawadzki
Browse files

test: Wait for 'nvme disconnect' operations to remove disks 



Use waitforserial_disconnect to wait for all nvme disconnect operations
to actually finish.

Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Change-Id: I91f410d9a84db33cf5d8e9d7ecdd4e7a7003aae0
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9314


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarDong Yi <yidong0635@126.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 5a6f3a6f

test/nvmf/target/filesystem.sh

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ function nvmf_filesystem_part() { 


	sync

	nvme disconnect -n "nqn.2016-06.io.spdk:cnode1" || true

	waitforserial_disconnect "$NVMF_SERIAL"



	$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1

test/nvmf/target/fio.sh

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ fio_status=0 
wait $fio_pid || fio_status=$?



nvme disconnect -n "nqn.2016-06.io.spdk:cnode1" || true

waitforserial_disconnect "$NVMF_SERIAL"



if [ $fio_status -eq 0 ]; then

	echo "nvmf hotplug test: fio successful - expected failure"

test/nvmf/target/initiator_timeout.sh

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ fio_status=0 
wait $fio_pid || fio_status=$?



nvme disconnect -n "nqn.2016-06.io.spdk:cnode1" || true

waitforserial_disconnect "$NVMF_SERIAL"



if [ $fio_status -eq 0 ]; then

	echo "nvmf hotplug test: fio successful as expected"

test/nvmf/target/multiconnection.sh

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ $rootdir/scripts/fio-wrapper -p nvmf -i 262144 -d 64 -t randwrite -r 10 
sync

for i in $(seq 1 $NVMF_SUBSYS); do

	nvme disconnect -n "nqn.2016-06.io.spdk:cnode${i}" || true

	waitforserial_disconnect SPDK$i

	$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode${i}

done

test/nvmf/target/multipath.sh

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ check_ana_state "$subsys_id" "$ctrl2_id" "inaccessible" 
wait $fio_pid



nvme disconnect -n "nqn.2016-06.io.spdk:cnode1" || true

waitforserial_disconnect "$NVMF_SERIAL"



$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1