a95aefc38a
Test failed both on x86_64 and aarch64 on some cases: 1.nvme_cfg=$($rootdir/scripts/gen_nvme.sh) If the driver haven't been changed to vfio-pci(haven't run scripts/setup.sh), we got no result from gen_nvme.sh. 2."mountpoints=$(lsblk /dev/$blkname --output MOUNTPOINT -n | wc -w)" The global variable "blkname" (defined in get_nvme_name_from_bdf) is always null here. For the scope of shell global variable is current process. However, "name=$(get_nvme_name_from_bdf $1)" will create a new process. We use variable "name" here. 3."name=$(get_nvme_name_from_bdf $1)" If the "$rootdir/scripts/setup.sh reset" above is not ready, $name will be null. For some non-x86 platforms, the waiting time maybe not enough. So I adjust it to 5 seconds according to repeated tests. Signed-off-by: Richael Zhuang <richael.zhuang@arm.com> Change-Id: Ia91460a3116bc0cc7c6c5f5ee471957caf9d0e06 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/474184 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Vitaliy Mysak <vitaliy.mysak@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
81 lines
2.0 KiB
Bash
Executable File
81 lines
2.0 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
curdir=$(dirname $(readlink -f "$BASH_SOURCE"))
|
|
rootdir=$(readlink -f $curdir/../../..)
|
|
source $rootdir/scripts/common.sh
|
|
source $rootdir/test/common/autotest_common.sh
|
|
|
|
function clear_nvme()
|
|
{
|
|
# Clear metadata on NVMe device
|
|
$rootdir/scripts/setup.sh reset
|
|
sleep 5
|
|
name=$(get_nvme_name_from_bdf $1)
|
|
mountpoints=$(lsblk /dev/$name --output MOUNTPOINT -n | wc -w)
|
|
if [ "$mountpoints" != "0" ]; then
|
|
$rootdir/scripts/setup.sh
|
|
exit 1
|
|
fi
|
|
dd if=/dev/zero of=/dev/$name bs=1M count=1000 oflag=direct
|
|
$rootdir/scripts/setup.sh
|
|
}
|
|
|
|
rpc_py=$rootdir/scripts/rpc.py
|
|
|
|
$rootdir/scripts/setup.sh
|
|
nvme_cfg=$($rootdir/scripts/gen_nvme.sh)
|
|
|
|
config="
|
|
$nvme_cfg
|
|
|
|
[Split]
|
|
Split Nvme0n1 7 128
|
|
"
|
|
echo "$config" > $curdir/config
|
|
|
|
# Clear only nvme device which we will use in test
|
|
bdf=$($rootdir/scripts/gen_nvme.sh --json | jq '.config[0].params.traddr' | sed s/\"//g)
|
|
|
|
clear_nvme $bdf
|
|
|
|
$rootdir/app/iscsi_tgt/iscsi_tgt -c $curdir/config &
|
|
spdk_pid=$!
|
|
|
|
waitforlisten $spdk_pid
|
|
|
|
# Create ocf on persistent storage
|
|
|
|
$rpc_py bdev_ocf_create ocfWT wt Nvme0n1p0 Nvme0n1p1
|
|
$rpc_py bdev_ocf_create ocfPT pt Nvme0n1p2 Nvme0n1p3
|
|
$rpc_py bdev_ocf_create ocfWB0 wb Nvme0n1p4 Nvme0n1p5
|
|
$rpc_py bdev_ocf_create ocfWB1 wb Nvme0n1p4 Nvme0n1p6
|
|
|
|
# Sorting bdevs because we dont guarantee that they are going to be
|
|
# in the same order after shutdown
|
|
($rpc_py bdev_ocf_get_bdevs | jq '(.. | arrays) |= sort') > ./ocf_bdevs
|
|
|
|
trap - SIGINT SIGTERM EXIT
|
|
|
|
killprocess $spdk_pid
|
|
|
|
# Check for ocf persistency after restart
|
|
$rootdir/app/iscsi_tgt/iscsi_tgt -c $curdir/config &
|
|
spdk_pid=$!
|
|
|
|
trap 'killprocess $spdk_pid; rm -f $curdir/config ocf_bdevs ocf_bdevs_verify; exit 1' SIGINT SIGTERM EXIT
|
|
|
|
waitforlisten $spdk_pid
|
|
|
|
# OCF should be loaded now as well
|
|
|
|
($rpc_py bdev_ocf_get_bdevs | jq '(.. | arrays) |= sort') > ./ocf_bdevs_verify
|
|
|
|
diff ocf_bdevs ocf_bdevs_verify
|
|
|
|
trap - SIGINT SIGTERM EXIT
|
|
|
|
killprocess $spdk_pid
|
|
rm -f $curdir/config ocf_bdevs ocf_bdevs_verify
|
|
|
|
clear_nvme $bdf
|