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

test/vhost: add trap to lvol test

Browse Source 
Change-Id: Ibd3e485085793260ca4bb2bfa3da6025b2c997aa
Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.gerrithub.io/392450
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Karol Latecki 2017-12-20 08:54:03 +01:00 committed by Jim Harris
parent 14797d839d
commit 90aca6641d
1 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
test/vhost/lvol/lvol_test.sh
View File

@ -42,6 +42,33 @@ function usage()
exit 0 exit 0
} }
function clean_lvol_cfg()
{
echo "INFO: Removing nested lvol bdevs"
for lvol_bdev in "${nest_lvol_bdevs[@]}"; do
$rpc_py delete_bdev $lvol_bdev
echo -e "\tINFO: nested lvol bdev $lvol_bdev removed"
done
echo "INFO: Removing nested lvol stores"
for lvol_store in "${nest_lvol_stores[@]}"; do
$rpc_py destroy_lvol_store -u $lvol_store
echo -e "\tINFO: nested lvol store $lvol_store removed"
done
echo "INFO: Removing lvol bdevs"
for lvol_bdev in "${lvol_bdevs[@]}"; do
$rpc_py delete_bdev $lvol_bdev
echo -e "\tINFO: lvol bdev $lvol_bdev removed"
done
echo "INFO: Removing lvol stores"
for lvol_store in "${lvol_stores[@]}"; do
$rpc_py destroy_lvol_store -u $lvol_store
echo -e "\tINFO: lvol store $lvol_store removed"
done
}
while getopts 'xh-:' optchar; do while getopts 'xh-:' optchar; do
case "$optchar" in case "$optchar" in
-) -)
@ -81,7 +108,7 @@ if $distribute_cores; then
source $BASE_DIR/autotest.config source $BASE_DIR/autotest.config
fi fi
trap 'error_exit "${FUNCNAME}" "${LINENO}"' ERR trap 'error_exit "${FUNCNAME}" "${LINENO}"' SIGTERM SIGABRT ERR
vm_kill_all vm_kill_all
@ -90,6 +117,8 @@ echo ""
$COMMON_DIR/run_vhost.sh $x --work-dir=$TEST_DIR --conf-dir=$BASE_DIR $COMMON_DIR/run_vhost.sh $x --work-dir=$TEST_DIR --conf-dir=$BASE_DIR
echo "" echo ""
trap 'clean_lvol_cfg; error_exit "${FUNCNAME}" "${LINENO}"' SIGTERM SIGABRT ERR
lvol_stores=() lvol_stores=()
lvol_bdevs=() lvol_bdevs=()
nest_lvol_stores=() nest_lvol_stores=()
@ -240,29 +269,7 @@ elif [[ "$ctrl_type" == "vhost_blk" ]]; then
done done
fi fi
echo "INFO: Removing nested lvol bdevs" clean_lvol_cfg
for lvol_bdev in "${nest_lvol_bdevs[@]}"; do
$rpc_py delete_bdev $lvol_bdev
echo -e "\tINFO: nested lvol bdev $lvol_bdev removed"
done
echo "INFO: Removing nested lvol stores"
for lvol_store in "${nest_lvol_stores[@]}"; do
$rpc_py destroy_lvol_store -u $lvol_store
echo -e "\tINFO: nested lvol store $lvol_store removed"
done
echo "INFO: Removing lvol bdevs"
for lvol_bdev in "${lvol_bdevs[@]}"; do
$rpc_py delete_bdev $lvol_bdev
echo -e "\tINFO: lvol bdev $lvol_bdev removed"
done
echo "INFO: Removing lvol stores"
for lvol_store in "${lvol_stores[@]}"; do
$rpc_py destroy_lvol_store -u $lvol_store
echo -e "\tINFO: lvol store $lvol_store removed"
done
$rpc_py get_lvol_stores $rpc_py get_lvol_stores
$rpc_py get_bdevs $rpc_py get_bdevs