f9d52c9ebd
This is the first step toward fixing the behavior of the lvol bdev module so that it handles spdk_bdev_unregister() correctly. Currently, when an lvol bdev is unregistered, this causes the associated lvol to be deleted; this isn't the desired behavior, since spdk_bdev_unregister() is just meant to drop the currently-exposed bdev, as in a hot-unplug event, not destroy the backing storage. The current implementation of the new destroy_lvol_bdev method still calls into the exsting (broken) spdk_bdev_unregister() path, but this at least lets us fix the existing delete_bdev RPC callers that really intended to destroy the lvol. The next step is to make vbdev_lvol_destroy() call spdk_lvol_destroy() instead of unregistering the bdev, which will require cleanup in the generic lvol layer to remove the close_only flag. Change-Id: Ic4cb51305d31f6d7366a82ba7bf7b19ebbcd3e9c Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com> Reviewed-on: https://review.gerrithub.io/408084 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
80 lines
2.9 KiB
Bash
Executable File
80 lines
2.9 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/scripts/common.sh
|
|
source $rootdir/test/nvmf/common.sh
|
|
|
|
rpc_py="python $rootdir/scripts/rpc.py"
|
|
|
|
set -e
|
|
|
|
RDMA_IP_LIST=$(get_available_rdma_ips)
|
|
NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
|
|
if [ -z $NVMF_FIRST_TARGET_IP ]; then
|
|
echo "no NIC for nvmf test"
|
|
exit 0
|
|
fi
|
|
|
|
if [ ! -d /usr/src/fio ]; then
|
|
echo "FIO not available"
|
|
exit 0
|
|
fi
|
|
|
|
timing_enter fio
|
|
timing_enter start_nvmf_tgt
|
|
|
|
$NVMF_APP -c $testdir/../nvmf.conf &
|
|
nvmfpid=$!
|
|
|
|
trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT
|
|
|
|
waitforlisten $nvmfpid
|
|
timing_exit start_nvmf_tgt
|
|
|
|
bdevs="$bdevs $($rpc_py construct_malloc_bdev 64 512)"
|
|
$rpc_py construct_nvmf_subsystem nqn.2016-06.io.spdk:cnode1 "trtype:RDMA traddr:$NVMF_FIRST_TARGET_IP trsvcid:4420" '' -a -s SPDK00000000000001 -n "$bdevs"
|
|
|
|
PLUGIN_DIR=$rootdir/examples/nvme/fio_plugin
|
|
|
|
# Test fio_plugin as host with malloc backend
|
|
LD_PRELOAD=$PLUGIN_DIR/fio_plugin /usr/src/fio/fio $PLUGIN_DIR/example_config.fio --filename="trtype=RDMA adrfam=IPv4 \
|
|
traddr=$NVMF_FIRST_TARGET_IP trsvcid=4420 ns=1"
|
|
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
|
|
|
|
if [ $RUN_NIGHTLY -eq 1 ]; then
|
|
# Test fio_plugin as host with nvme lvol backend
|
|
bdfs=$(iter_pci_class_code 01 08 02)
|
|
$rpc_py construct_nvme_bdev -b Nvme0 -t PCIe -a $(echo $bdfs | awk '{ print $1 }')
|
|
ls_guid=$($rpc_py construct_lvol_store Nvme0n1 lvs_0)
|
|
get_lvs_free_mb $ls_guid
|
|
lb_guid=$($rpc_py construct_lvol_bdev -u $ls_guid lbd_0 $free_mb)
|
|
$rpc_py construct_nvmf_subsystem nqn.2016-06.io.spdk:cnode2 "trtype:RDMA traddr:$NVMF_FIRST_TARGET_IP trsvcid:4420" "" -a -s SPDK00000000000002 -n "$lb_guid"
|
|
LD_PRELOAD=$PLUGIN_DIR/fio_plugin /usr/src/fio/fio $PLUGIN_DIR/example_config.fio --filename="trtype=RDMA adrfam=IPv4 \
|
|
traddr=$NVMF_FIRST_TARGET_IP trsvcid=4420 ns=1"
|
|
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode2
|
|
|
|
# Test fio_plugin as host with nvme lvol nested backend
|
|
ls_nested_guid=$($rpc_py construct_lvol_store $lb_guid lvs_n_0)
|
|
get_lvs_free_mb $ls_nested_guid
|
|
lb_nested_guid=$($rpc_py construct_lvol_bdev -u $ls_nested_guid lbd_nest_0 $free_mb)
|
|
$rpc_py construct_nvmf_subsystem nqn.2016-06.io.spdk:cnode3 "trtype:RDMA traddr:$NVMF_FIRST_TARGET_IP trsvcid:4420" "" -a -s SPDK00000000000003 -n "$lb_nested_guid"
|
|
LD_PRELOAD=$PLUGIN_DIR/fio_plugin /usr/src/fio/fio $PLUGIN_DIR/example_config.fio --filename="trtype=RDMA adrfam=IPv4 \
|
|
traddr=$NVMF_FIRST_TARGET_IP trsvcid=4420 ns=1"
|
|
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode3
|
|
|
|
sync
|
|
# Delete lvol_bdev and destroy lvol_store.
|
|
$rpc_py destroy_lvol_bdev "$lb_nested_guid"
|
|
$rpc_py destroy_lvol_store -l lvs_n_0
|
|
$rpc_py destroy_lvol_bdev "$lb_guid"
|
|
$rpc_py destroy_lvol_store -l lvs_0
|
|
$rpc_py delete_bdev "Nvme0n1"
|
|
fi
|
|
|
|
trap - SIGINT SIGTERM EXIT
|
|
|
|
killprocess $nvmfpid
|
|
timing_exit fio
|