Commit 29ca9d63 authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Ben Walker
Browse files

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



Fixes #694

Change-Id: I8c3a34923ece8e11f1f3fefc3e642a00dd83a735
Signed-off-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/450022


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarPaweł Niedźwiecki <pawelx.niedzwiecki@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent d0111963

test/vhost/initiator/blockdev.sh

+7 −3
Original line number Diff line number Diff line
@@ -64,12 +64,16 @@ fi 


function remove_kernel_vhost()

{

	if targetcli "/vhost/$kernel_vhost_disk ls"; then

		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;\

 error_exit "${FUNCNAME}""${LINENO}"' ERR SIGTERM SIGABRT

 remove_kernel_vhost; error_exit "${FUNCNAME}""${LINENO}"' ERR SIGTERM SIGABRT

function run_spdk_fio() {

	LD_PRELOAD=$PLUGIN_DIR/fio_plugin $FIO_PATH/fio --ioengine=spdk_bdev\

         "$@" --spdk_mem=1024 --spdk_single_seg=1