ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/vhost: Remove ramdisk and vhost disk from targetcli if script fails

Browse Source 
Fixes #694

Change-Id: I8c3a34923ece8e11f1f3fefc3e642a00dd83a735
Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/450022
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Paweł Niedźwiecki <pawelx.niedzwiecki@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Pawel Kaminski 2019-04-03 08:28:18 -04:00 committed by Ben Walker
parent d011196380
commit 29ca9d63b8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/vhost/initiator/blockdev.sh
View File

@ -64,12 +64,16 @@ fi
function remove_kernel_vhost() function remove_kernel_vhost()
{ {
targetcli "/vhost delete $kernel_vhost_disk" if targetcli "/vhost/$kernel_vhost_disk ls"; then
targetcli "/backstores/$targetcli_rd_name delete ramdisk" targetcli "/vhost delete $kernel_vhost_disk"
fi
if targetcli "/backstores/$targetcli_rd_name/ramdisk ls"; then
targetcli "/backstores/$targetcli_rd_name delete ramdisk"
fi
} }
trap 'rm -f *.state $ROOT_DIR/spdk.tar.gz $ROOT_DIR/fio.tar.gz $(get_vhost_dir)/Virtio0;\ trap 'rm -f *.state $ROOT_DIR/spdk.tar.gz $ROOT_DIR/fio.tar.gz $(get_vhost_dir)/Virtio0;\
error_exit "${FUNCNAME}""${LINENO}"' ERR SIGTERM SIGABRT remove_kernel_vhost; error_exit "${FUNCNAME}""${LINENO}"' ERR SIGTERM SIGABRT
function run_spdk_fio() { function run_spdk_fio() {
LD_PRELOAD=$PLUGIN_DIR/fio_plugin $FIO_PATH/fio --ioengine=spdk_bdev\ LD_PRELOAD=$PLUGIN_DIR/fio_plugin $FIO_PATH/fio --ioengine=spdk_bdev\
"$@" --spdk_mem=1024 --spdk_single_seg=1 "$@" --spdk_mem=1024 --spdk_single_seg=1