test/multipath: print bdevperf logs on failure

This should help debugging issue #2865.  Additionally, moved the trap
code to a separate function, as it was getting too large.

Signed-off-by: Konrad Sztyber <konrad.sztyber@intel.com>
Change-Id: Ieb4881cdfed4e5d88e38859fa0807b673a87913b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16664
Reviewed-by: Michal Berger <michal.berger@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Konrad Sztyber 2023-02-02 11:52:46 +01:00 committed by Tomasz Zawadzki
parent 55f9479333
commit ec14a7b6e3

View File

@ -19,6 +19,14 @@ bdevperf_rpc_sock=/var/tmp/bdevperf.sock
# NQN prefix to use for subsystem NQNs
NQN=nqn.2016-06.io.spdk:cnode1
cleanup() {
process_shm --id $NVMF_APP_SHM_ID || true
cat $testdir/try.txt
rm -f $testdir/try.txt
killprocess $bdevperf_pid
nvmftestfini
}
nvmftestinit
nvmfappstart -m 0x3
@ -35,7 +43,7 @@ $rpc_py nvmf_subsystem_add_listener $NQN -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGE
$rootdir/build/examples/bdevperf -m 0x4 -z -r $bdevperf_rpc_sock -q 128 -o 4096 -w verify -t 90 &> $testdir/try.txt &
bdevperf_pid=$!
trap 'process_shm --id $NVMF_APP_SHM_ID; rm -f $testdir/try.txt; killprocess $bdevperf_pid; nvmftestfini; exit 1' SIGINT SIGTERM EXIT
trap 'cleanup; exit 1' SIGINT SIGTERM EXIT
waitforlisten $bdevperf_pid $bdevperf_rpc_sock
# Create a controller and set multipath behavior