Commit d9715a09 authored by Artur Paszkiewicz's avatar Artur Paszkiewicz Committed by Tomasz Zawadzki
Browse files

test/raid: improve script cleanup 



Signed-off-by: default avatarArtur Paszkiewicz <artur.paszkiewicz@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/23205

 (master)

(cherry picked from commit 5d6ea30d)
Change-Id: Ia5d0dd1d97901f5cd4d250679b4d6036b4966bbd
Signed-off-by: default avatarMarek Chomnicki <marek.chomnicki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/23313


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent 73e098f7

test/bdev/bdev_raid.sh

+9 −8
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ 
testdir=$(readlink -f $(dirname $0))

rootdir=$(readlink -f $testdir/../..)

rpc_server=/var/tmp/spdk-raid.sock

tmp_file=$SPDK_TEST_STORAGE/raidrandtest

tmp_dir=$SPDK_TEST_STORAGE/raidtest

tmp_file=$tmp_dir/raidrandtest



source $rootdir/test/common/autotest_common.sh

source $testdir/nbd_common.sh
@@ -53,14 +54,12 @@ function raid_unmap_data_verify() { 
	return 0

}



function on_error_exit() {

	if [ -n "$raid_pid" ]; then

function cleanup() {

	if [ -n "$raid_pid" ] && ps -p $raid_pid > /dev/null; then

		killprocess $raid_pid

	fi



	rm -f $tmp_file

	print_backtrace

	exit 1

	rm -rf "$tmp_dir"

}



function configure_raid_bdev() {
@@ -785,7 +784,8 @@ function raid_rebuild_test() { 
	return 0

}



trap 'on_error_exit;' ERR

mkdir -p "$tmp_dir"

trap 'cleanup; exit 1' EXIT



base_blocklen=512
@@ -847,4 +847,5 @@ run_test "raid_state_function_test_sb_md_interleaved" raid_state_function_test r 
run_test "raid_superblock_test_md_interleaved" raid_superblock_test raid1 2

run_test "raid_rebuild_test_sb_md_interleaved" raid_rebuild_test raid1 2 true false false



rm -f $tmp_file
 
trap - EXIT

cleanup