Commit fead05c0 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

test/nvmf: Rework the traps 



Declare single trap from nvmftestinit() instead overriding main trap
depending on the use-case (veth vs phy).

Signed-off-by: default avatarMichal Berger <michalx.berger@intel.com>
Change-Id: I23c66fc5728510d06eee9837843f0734b2d03dcf
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7850


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 9b3773db

test/nvmf/common.sh

+7 −7
Original line number Diff line number Diff line
@@ -280,8 +280,6 @@ function nvmf_veth_init() { 
	"${NVMF_TARGET_NS_CMD[@]}" ip link delete $NVMF_TARGET_INTERFACE2 || true

	ip netns del $NVMF_TARGET_NAMESPACE || true



	trap 'nvmf_veth_fini; exit 1' SIGINT SIGTERM EXIT



	# Create network namespace

	ip netns add $NVMF_TARGET_NAMESPACE
@@ -368,8 +366,6 @@ function nvmf_tcp_init() { 
	ip -4 addr flush $NVMF_TARGET_INTERFACE || true

	ip -4 addr flush $NVMF_INITIATOR_INTERFACE || true



	trap 'nvmf_tcp_fini; exit 1' SIGINT SIGTERM



	# Create network namespace

	ip netns add $NVMF_TARGET_NAMESPACE
@@ -401,8 +397,10 @@ function nvmf_tcp_fini() { 
		nvmf_veth_fini

		return 0

	fi

	if [[ -n $NVMF_TARGET_NAMESPACE && -e /var/run/netns/$NVMF_TARGET_NAMESPACE ]]; then

		ip netns del $NVMF_TARGET_NAMESPACE

	ip -4 addr flush $NVMF_INITIATOR_INTERFACE

	fi

	ip -4 addr flush $NVMF_INITIATOR_INTERFACE || :

}



function nvmftestinit() {
@@ -410,6 +408,9 @@ function nvmftestinit() { 
		echo "transport not specified - use --transport= to specify"

		return 1

	fi



	trap 'process_shm --id $NVMF_APP_SHM_ID || :; nvmftestfini' SIGINT SIGTERM EXIT



	if [ "$TEST_MODE" == "iso" ]; then

		$rootdir/scripts/setup.sh

		if [[ "$TEST_TRANSPORT" == "rdma" ]]; then
@@ -448,7 +449,6 @@ function nvmfappstart() { 
	timing_enter start_nvmf_tgt

	"${NVMF_APP[@]}" "$@" &

	nvmfpid=$!

	trap 'process_shm --id $NVMF_APP_SHM_ID; nvmftestfini; exit 1' SIGINT SIGTERM EXIT

	waitforlisten $nvmfpid

	timing_exit start_nvmf_tgt

}