53147e0dc8
During test before upgrading our vm's to Fedora31 there were issue with failing nvmf test on function waitforblk. In some cases hardcoded nvme0n1 name was not found in system. Here is fix that change searching by name to searching by nvme serial. Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com> Change-Id: Ic5ee70804652a057fa26b8cc004b5227262d2122 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478471 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Seth Howell <seth.howell@intel.com> Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
84 lines
2.2 KiB
Bash
Executable File
84 lines
2.2 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
testdir=$(readlink -f $(dirname $0))
|
|
rootdir=$(readlink -f $testdir/../../..)
|
|
source $rootdir/test/common/autotest_common.sh
|
|
source $rootdir/test/nvmf/common.sh
|
|
|
|
MALLOC_BDEV_SIZE=64
|
|
MALLOC_BLOCK_SIZE=512
|
|
|
|
rpc_py="$rootdir/scripts/rpc.py"
|
|
|
|
nvmftestinit
|
|
|
|
function nvmf_filesystem_create {
|
|
fstype=$1
|
|
nvme_name=$2
|
|
|
|
if [ $fstype = ext4 ]; then
|
|
force=-F
|
|
else
|
|
force=-f
|
|
fi
|
|
|
|
mkfs.${fstype} $force /dev/${nvme_name}p1
|
|
|
|
mount /dev/${nvme_name}p1 /mnt/device
|
|
touch /mnt/device/aaa
|
|
sync
|
|
rm /mnt/device/aaa
|
|
sync
|
|
umount /mnt/device
|
|
}
|
|
|
|
function nvmf_filesystem_part {
|
|
incapsule=$1
|
|
|
|
nvmfappstart "-m 0xF"
|
|
|
|
$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192 -c $incapsule
|
|
$rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc1
|
|
$rpc_py nvmf_create_subsystem nqn.2016-06.io.spdk:cnode1 -a -s $NVMF_SERIAL
|
|
$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 Malloc1
|
|
$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT
|
|
|
|
nvme connect -t $TEST_TRANSPORT -n "nqn.2016-06.io.spdk:cnode1" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"
|
|
|
|
waitforserial "$NVMF_SERIAL"
|
|
nvme_name=$(lsblk -l -o NAME,SERIAL | grep -oP "([\w]*)(?=\s+${NVMF_SERIAL})")
|
|
|
|
mkdir -p /mnt/device
|
|
|
|
parted -s /dev/${nvme_name} mklabel msdos mkpart primary '0%' '100%'
|
|
partprobe
|
|
sleep 1
|
|
|
|
if [ $incapsule -eq 0 ]; then
|
|
run_test "filesystem_ext4" nvmf_filesystem_create "ext4" ${nvme_name}
|
|
run_test "filesystem_btrfs" nvmf_filesystem_create "btrfs" ${nvme_name}
|
|
run_test "filesystem_xfs" nvmf_filesystem_create "xfs" ${nvme_name}
|
|
else
|
|
run_test "filesystem_incapsule_ext4" nvmf_filesystem_create "ext4" ${nvme_name}
|
|
run_test "filesystem_incapsule_btrfs" nvmf_filesystem_create "btrfs" ${nvme_name}
|
|
run_test "filesystem_incapsule_xfs" nvmf_filesystem_create "xfs" ${nvme_name}
|
|
fi
|
|
|
|
parted -s /dev/${nvme_name} rm 1
|
|
|
|
sync
|
|
nvme disconnect -n "nqn.2016-06.io.spdk:cnode1" || true
|
|
|
|
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
|
|
|
|
trap - SIGINT SIGTERM EXIT
|
|
|
|
killprocess $nvmfpid
|
|
nvmfpid=
|
|
}
|
|
|
|
run_test "nvmf_filesystem_no_incapsule" nvmf_filesystem_part 0
|
|
run_test "nvmf_filesystem_incapsule" nvmf_filesystem_part 4096
|
|
|
|
nvmftestfini
|