Commit b8066755 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

scripts/setup remove flakiness from tests 



This removes all the sleeps called after setup.sh reset. These
sleeps were meant to wait for devices given tests depend on.

Change-Id: Ibb86c9f6f8d5f1b05d165e84d9019530af84f9ea
Signed-off-by: default avatarMichal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4035


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 6182bff2

autotest.sh

+0 −3
Original line number Diff line number Diff line
@@ -83,9 +83,6 @@ rm -f /var/tmp/spdk*.sock 
# Load the kernel driver

./scripts/setup.sh reset



# Let the kernel discover any filesystems or partitions

sleep 10



if [ $(uname -s) = Linux ]; then

	# OCSSD devices drivers don't support IO issues by kernel so

	# detect OCSSD devices and blacklist them (unbind from any driver).

test/bdev/blockdev.sh

+0 −6
Original line number Diff line number Diff line
@@ -55,11 +55,6 @@ function setup_nvme_conf() { 
function setup_gpt_conf() {

	if [[ $(uname -s) = Linux ]] && hash sgdisk; then

		$rootdir/scripts/setup.sh reset

		# FIXME: Note that we are racing with the kernel here. There's no guarantee that

		# proper object will be already in place under sysfs nor that any udev-like

		# helper created proper block devices for us. Replace the below sleep with proper

		# udev settle routine.

		sleep 1s

		# Get nvme devices by following drivers' links towards nvme class

		local nvme_devs=(/sys/bus/pci/drivers/nvme/*/nvme/nvme*/nvme*n*) nvme_dev

		gpt_nvme=""
@@ -398,7 +393,6 @@ fi 
#-----------------------------------------------------

if [ "$test_type" = "gpt" ]; then

	"$rootdir/scripts/setup.sh" reset

	sleep 1s

	if [[ -b $gpt_nvme ]]; then

		dd if=/dev/zero of="$gpt_nvme" bs=4096 count=8 oflag=direct

	fi

test/common/autotest_common.sh

+0 −1
Original line number Diff line number Diff line
@@ -1267,7 +1267,6 @@ function nvme_namespace_revert() { 
	bdfs=$(get_nvme_bdfs)



	$rootdir/scripts/setup.sh reset

	sleep 1



	for bdf in $bdfs; do

		nvme_ctrlr=/dev/$(get_nvme_ctrlr_from_bdf ${bdf})

test/nvme/cuse/nvme_ns_manage_cuse.sh

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ sleep 1 
bdfs=$(get_nvme_bdfs)



$rootdir/scripts/setup.sh reset

sleep 1



# Find bdf that supports Namespace Managment

for bdf in $bdfs; do

test/nvme/cuse/spdk_nvme_cli_cuse.sh

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ rpc_py=$rootdir/scripts/rpc.py 
bdf=$(get_first_nvme_bdf)



PCI_WHITELIST="${bdf}" $rootdir/scripts/setup.sh reset

sleep 1

nvme_name=$(get_nvme_ctrlr_from_bdf ${bdf})

if [[ -z "$nvme_name" ]]; then

	echo "setup.sh failed bind kernel driver to ${bdf}"