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

test/spdkcli: Adjust traps

Browse Source 
Mainly, don't trigger them on ERR, simply on EXIT - the ERR is
reserved for the main tracing trap set by autotest_common.sh and it
should not be overwritten.

Signed-off-by: Michal Berger <michal.berger@intel.com>
Change-Id: I435d1c08c29557692c134a087350f8538ebf92f9
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16708
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Michal Berger 2023-02-07 17:26:58 +01:00 committed by Tomasz Zawadzki
parent fe648cb987
commit 6f3127adb1
8 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/spdkcli/common.sh
View File

@ -6,8 +6,7 @@
spdkcli_job="$rootdir/test/spdkcli/spdkcli_job.py" spdkcli_job="$rootdir/test/spdkcli/spdkcli_job.py"
spdk_clear_config_py="$rootdir/test/json_config/clear_config.py" spdk_clear_config_py="$rootdir/test/json_config/clear_config.py"
function on_error_exit() { function cleanup() {
set +e
if [ -n "$spdk_tgt_pid" ]; then if [ -n "$spdk_tgt_pid" ]; then
killprocess $spdk_tgt_pid killprocess $spdk_tgt_pid
fi fi
@ -21,8 +20,6 @@ function on_error_exit() {
killprocess $vhost_tgt_pid killprocess $vhost_tgt_pid
fi fi
rm -f $testdir/${MATCH_FILE} $testdir/match_files/spdkcli_details_vhost.test /tmp/sample_aio /tmp/sample_pmem rm -f $testdir/${MATCH_FILE} $testdir/match_files/spdkcli_details_vhost.test /tmp/sample_aio /tmp/sample_pmem
print_backtrace
exit 1
} }
function run_spdk_tgt() { function run_spdk_tgt() {

2
test/spdkcli/iscsi.sh
View File

@ -12,7 +12,7 @@ source $rootdir/test/iscsi_tgt/common.sh
MATCH_FILE="spdkcli_iscsi.test" MATCH_FILE="spdkcli_iscsi.test"
SPDKCLI_BRANCH="/iscsi" SPDKCLI_BRANCH="/iscsi"
trap 'on_error_exit;' ERR trap 'cleanup' EXIT
timing_enter run_iscsi_tgt timing_enter run_iscsi_tgt

2
test/spdkcli/nvmf.sh
View File

@ -12,7 +12,7 @@ source $rootdir/test/nvmf/common.sh
MATCH_FILE="spdkcli_nvmf.test" MATCH_FILE="spdkcli_nvmf.test"
SPDKCLI_BRANCH="/nvmf" SPDKCLI_BRANCH="/nvmf"
trap 'on_error_exit' ERR trap 'cleanup' EXIT
timing_enter run_nvmf_tgt timing_enter run_nvmf_tgt
run_nvmf_tgt run_nvmf_tgt

2
test/spdkcli/pmem.sh
View File

@ -11,7 +11,7 @@ source $rootdir/test/spdkcli/common.sh
MATCH_FILE="spdkcli_pmem.test" MATCH_FILE="spdkcli_pmem.test"
SPDKCLI_BRANCH="/bdevs/pmemblk" SPDKCLI_BRANCH="/bdevs/pmemblk"
trap 'rm -f $testdir/match_files/spdkcli_pmem_info.test; on_error_exit;' ERR trap 'rm -f $testdir/match_files/spdkcli_pmem_info.test; cleanup' EXIT
timing_enter run_spdk_tgt timing_enter run_spdk_tgt
run_spdk_tgt run_spdk_tgt

2
test/spdkcli/raid.sh
View File

@ -14,7 +14,7 @@ SPDKCLI_BRANCH="/bdevs"
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
. $testdir/common.sh . $testdir/common.sh
trap 'on_error_exit;' ERR trap 'cleanup' EXIT
timing_enter run_spdk_tgt timing_enter run_spdk_tgt
run_spdk_tgt run_spdk_tgt

3
test/spdkcli/rbd.sh
View File

@ -11,13 +11,12 @@ source $rootdir/test/spdkcli/common.sh
MATCH_FILE="spdkcli_rbd.test" MATCH_FILE="spdkcli_rbd.test"
SPDKCLI_BRANCH="/bdevs/rbd" SPDKCLI_BRANCH="/bdevs/rbd"
trap 'on_error_exit' ERR trap 'rbd_cleanup; cleanup' EXIT
timing_enter run_spdk_tgt timing_enter run_spdk_tgt
run_spdk_tgt run_spdk_tgt
timing_exit run_spdk_tgt timing_exit run_spdk_tgt
timing_enter spdkcli_create_rbd_config timing_enter spdkcli_create_rbd_config
trap 'rbd_cleanup; on_error_exit' ERR
rbd_cleanup rbd_cleanup
rbd_setup 127.0.0.1 rbd_setup 127.0.0.1
$spdkcli_job "\"/bdevs/rbd create rbd foo 512' 'Ceph0' True "\"/bdevs/rbd create rbd foo 512 'Ceph1' True" $spdkcli_job "\"/bdevs/rbd create rbd foo 512' 'Ceph0' True "\"/bdevs/rbd create rbd foo 512 'Ceph1' True"

2
test/spdkcli/vhost.sh
View File

@ -14,7 +14,7 @@ SPDKCLI_BRANCH="/"
sample_aio=$SPDK_TEST_STORAGE/sample_aio sample_aio=$SPDK_TEST_STORAGE/sample_aio
sample_aio2=$SPDK_TEST_STORAGE/sample_aio2 sample_aio2=$SPDK_TEST_STORAGE/sample_aio2
trap 'on_error_exit' ERR trap 'cleanup' EXIT
timing_enter run_vhost_tgt timing_enter run_vhost_tgt
run_vhost_tgt run_vhost_tgt
timing_exit run_vhost_tgt timing_exit run_vhost_tgt

2
test/spdkcli/virtio.sh
View File

@ -8,7 +8,7 @@ rootdir=$(readlink -f $testdir/../..)
source $rootdir/test/common/autotest_common.sh source $rootdir/test/common/autotest_common.sh
source $rootdir/test/spdkcli/common.sh source $rootdir/test/spdkcli/common.sh
trap 'killprocess $virtio_pid; on_error_exit' ERR trap 'killprocess $virtio_pid; cleanup' EXIT
timing_enter run_spdk_tgt timing_enter run_spdk_tgt
run_spdk_tgt run_spdk_tgt