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

test/ftl: Remove dead code 



In particular, non-volatile cache setup and EXTENDED fio tests:
these haven't been supported nor tested by the CI, thus there's
no value in keeping these routines anymore.

fio tests are limited to what was previously called as a "basic"
suite and hooked to standard SPDK_TEST_FTL flow.

Code which is not used by the remaining tests is removed as well.

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


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
parent 1d4a8810

test/common/autotest_common.sh

+0 −2
Original line number Diff line number Diff line
@@ -135,8 +135,6 @@ export SPDK_TEST_CRYPTO 
export SPDK_TEST_FTL

: ${SPDK_TEST_OCF=0}

export SPDK_TEST_OCF

: ${SPDK_TEST_FTL_EXTENDED=0}

export SPDK_TEST_FTL_EXTENDED

: ${SPDK_TEST_VMD=0}

export SPDK_TEST_VMD

: ${SPDK_TEST_OPAL=0}

test/ftl/common.sh

+0 −32
Original line number Diff line number Diff line
@@ -15,38 +15,6 @@ function get_num_pu() { 
		| grep 'PUs' | sed 's/[^0-9]//g'

}



function has_separate_md() {

	local md_type

	md_type=$($SPDK_EXAMPLE_DIR/identify -r "trtype:PCIe traddr:$1" \

		| grep 'Metadata Transferred' | cut -d: -f2)

	if [[ "$md_type" =~ Separate ]]; then

		return 0

	else

		return 1

	fi

}



function create_nv_cache_bdev() {

	local name=$1

	local ocssd_bdf=$2

	local cache_bdf=$3

	local num_punits=$4



	local bytes_to_mb=$((1024 * 1024))

	local chunk_size

	chunk_size=$(get_chunk_size $ocssd_bdf)



	# We need at least 2 bands worth of data + 1 block

	local size=$((2 * 4096 * chunk_size * num_punits + 1))

	# Round the size up to the nearest megabyte

	local size=$(((size + bytes_to_mb) / bytes_to_mb))



	# Create NVMe bdev on specified device and split it so that it has the desired size

	local nvc_bdev

	nvc_bdev=$($rootdir/scripts/rpc.py bdev_nvme_attach_controller -b $name -t PCIe -a $cache_bdf)

	$rootdir/scripts/rpc.py bdev_split_create $nvc_bdev -s $size 1

}



function gen_ftl_nvme_conf() {

	jq . <<- JSON

		{

test/ftl/config/fio/drive-prep.fio

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
[drive_prep]

ioengine=spdk_bdev

spdk_json_conf=${FTL_JSON_CONF}

filename=${FTL_BDEV_NAME}

thread=1



direct=1

buffered=0

size=100%

randrepeat=0

norandommap

bs=4k

iodepth=128

numjobs=1

rw=write

test/ftl/config/fio/randr.fio

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
[global]

ioengine=spdk_bdev

spdk_json_conf=${FTL_JSON_CONF}

filename=${FTL_BDEV_NAME}

direct=1

thread=1

buffered=0

size=100%

randrepeat=0

time_based

norandommap



[test]

stonewall

bs=4k

numjobs=4

rw=randread

iodepth=128

runtime=1200

test/ftl/config/fio/randrw.fio

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
[global]

ioengine=spdk_bdev

spdk_json_conf=${FTL_JSON_CONF}

filename=${FTL_BDEV_NAME}

direct=1

thread=1

buffered=0

size=100%

randrepeat=0

time_based

norandommap



[test]

stonewall

bs=4k

numjobs=4

rw=randrw

rwmixread=70

iodepth=32

runtime=1200