From 46fef66536a739c19de651208490d162ad9fdcac Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Fri, 3 May 2019 10:33:21 -0700 Subject: [PATCH] test/nvmf: improve nested lvol test Nested lvolstores take a very long time to create, since the initial unmap will get broken into one unmap per cluster for the underlying lvol. This test is working fine in the test pool, but they have much smaller SSDs. My system has a 3.7TB SSD, and this test times out. So don't bother clearing the nested lvol store - this saves unmap operations. We still have unmap operations when deleting the nested lvol, so increase the cluster size for the main lvolstore to 1GiB to reduce the total number of unmap operations. Signed-off-by: Jim Harris Change-Id: I29a254fff443e963cd620b55e78092d6a96f8ddd Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/453010 Tested-by: SPDK CI Jenkins Reviewed-by: Seth Howell Reviewed-by: John Kariuki Reviewed-by: Ben Walker Reviewed-by: Shuhei Matsumoto Reviewed-by: Darek Stojaczyk --- test/nvmf/host/fio.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/nvmf/host/fio.sh b/test/nvmf/host/fio.sh index 287038ad5..d78f86ed6 100755 --- a/test/nvmf/host/fio.sh +++ b/test/nvmf/host/fio.sh @@ -58,7 +58,7 @@ 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 }') -i $NVMF_FIRST_TARGET_IP - ls_guid=$($rpc_py construct_lvol_store Nvme0n1 lvs_0) + ls_guid=$($rpc_py construct_lvol_store -c 1073741824 Nvme0n1 lvs_0) get_lvs_free_mb $ls_guid $rpc_py construct_lvol_bdev -l lvs_0 lbd_0 $free_mb $rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode2 -a -s SPDK00000000000001 @@ -69,7 +69,7 @@ if [ $RUN_NIGHTLY -eq 1 ]; then $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 lvs_0/lbd_0 lvs_n_0) + ls_nested_guid=$($rpc_py construct_lvol_store --clear-method none lvs_0/lbd_0 lvs_n_0) get_lvs_free_mb $ls_nested_guid $rpc_py construct_lvol_bdev -l lvs_n_0 lbd_nest_0 $free_mb $rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode3 -a -s SPDK00000000000001