Commit 5170ac8d authored by Seth Howell's avatar Seth Howell Committed by Tomasz Zawadzki
Browse files

test/blockdev: move configuration before tests. 



This is a significant simplification to the whole test script. Note, it
does force us to run the hello_bdev example against a gpt bdev instead
of an nvme bdev directly, but I see this as an acceptable tradeoff since
it seems like the purpose of running the hello_bdev example is mostly to
ensure that the example itself is not broken.

Change-Id: I8c2a1ede8e7ece2a82222593a7ae46704cc658af
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/476935


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent b9ca149e

test/bdev/blockdev.sh

+38 −32
Original line number Diff line number Diff line
@@ -51,10 +51,6 @@ function nbd_function_test() { 
	return 0

}



QOS_DEV_1="Null_0"

QOS_DEV_2="Null_1"

QOS_RUN_TIME=5



function get_io_result() {

	local limit_type=$1

	local qos_dev=$2
@@ -143,6 +139,20 @@ function qos_function_test() { 
	fi

}



# Inital bdev creation and configuration

#-----------------------------------------------------

QOS_DEV_1="Null_0"

QOS_DEV_2="Null_1"

QOS_RUN_TIME=5



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

	# Test dynamic memory management. All hugepages will be reserved at runtime

	PRE_RESERVED_MEM=0

else

	# Dynamic memory management is not supported on BSD

	PRE_RESERVED_MEM=2048

fi



# Create a file to be used as an AIO backend

dd if=/dev/zero of=/tmp/aiofile bs=2048 count=5000
@@ -168,22 +178,38 @@ if hash pmempool; then 
	echo "  Blk /tmp/spdk-pmem-pool Pmem0" >> $testdir/bdev.conf

fi



timing_enter nbd_gpt

if grep -q Nvme0 $testdir/bdev.conf; then

	part_dev_by_gpt $testdir/bdev.conf Nvme0n1 $rootdir

fi

timing_exit nbd_gpt



timing_enter bdev_svc

bdevs=$(discover_bdevs $rootdir $testdir/bdev.conf | jq -r '.[] | select(.claimed == false)')

timing_exit bdev_svc



bdevs_name=$(echo $bdevs | jq -r '.name')



# Create conf file for bdevperf with gpt

cat > $testdir/bdev_gpt.conf << EOL

[Gpt]

  Disable No

EOL



# Get Nvme info through filtering gen_nvme.sh's result

$rootdir/scripts/gen_nvme.sh >> $testdir/bdev_gpt.conf

# End bdev configuration

#-----------------------------------------------------



if [ $RUN_NIGHTLY -eq 1 ]; then

	timing_enter hello_bdev

	if grep -q Nvme0 $testdir/bdev.conf; then

		$rootdir/examples/bdev/hello_world/hello_bdev -c $testdir/bdev.conf -b Nvme0n1

		$rootdir/examples/bdev/hello_world/hello_bdev -c $testdir/bdev.conf -b Nvme0n1p1

	fi

	timing_exit hello_bdev

fi



timing_enter bounds

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

	# Test dynamic memory management. All hugepages will be reserved at runtime

	PRE_RESERVED_MEM=0

else

	# Dynamic memory management is not supported on BSD

	PRE_RESERVED_MEM=2048

fi

$testdir/bdevio/bdevio -w -s $PRE_RESERVED_MEM -c $testdir/bdev.conf &

bdevio_pid=$!

trap 'killprocess $bdevio_pid; exit 1' SIGINT SIGTERM EXIT
@@ -194,18 +220,7 @@ killprocess $bdevio_pid 
trap - SIGINT SIGTERM EXIT

timing_exit bounds



timing_enter nbd_gpt

if grep -q Nvme0 $testdir/bdev.conf; then

	part_dev_by_gpt $testdir/bdev.conf Nvme0n1 $rootdir

fi

timing_exit nbd_gpt



timing_enter bdev_svc

bdevs=$(discover_bdevs $rootdir $testdir/bdev.conf | jq -r '.[] | select(.claimed == false)')

timing_exit bdev_svc



timing_enter nbd

bdevs_name=$(echo $bdevs | jq -r '.name')

nbd_function_test $testdir/bdev.conf "$bdevs_name"

timing_exit nbd
@@ -244,15 +259,6 @@ else 
	exit 1

fi



# Create conf file for bdevperf with gpt

cat > $testdir/bdev_gpt.conf << EOL

[Gpt]

  Disable No

EOL



# Get Nvme info through filtering gen_nvme.sh's result

$rootdir/scripts/gen_nvme.sh >> $testdir/bdev_gpt.conf



# Run bdevperf with gpt

$testdir/bdevperf/bdevperf -c $testdir/bdev_gpt.conf -q 128 -o 4096 -w verify -t 5

$testdir/bdevperf/bdevperf -c $testdir/bdev_gpt.conf -q 128 -o 4096 -w write_zeroes -t 1