Commit 388ca483 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

test/iscsi_tgt/nvme_remote: kill both processess on failure 



Fix the incorrect iSCSI PID ($pid) and also terminate nvmf_tgt on
failure.

Change-Id: I92457591c98c12f101a1713763ed9dc1feb32cb9
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent 6b7ea8f0

test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ echo "NVMf subsystem created." 
$rootdir/app/iscsi_tgt/iscsi_tgt -c $testdir/iscsi.conf -m 0x1 -p 0 -s 512 &

iscsipid=$!

echo "iSCSI target launched. pid: $iscsipid"

trap "killprocess $iscsipid; exit 1" SIGINT SIGTERM EXIT

trap "killprocess $iscsipid; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT

# The configuration file for the iSCSI target told it to use port 5261 for RPC

waitforlisten $iscsipid 5261

echo "iSCSI target has started."
@@ -60,7 +60,7 @@ sleep 1 
echo "Logging in to iSCSI target."

iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$ISCSI_PORT

iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT

trap "iscsicleanup; killprocess $pid; exit 1" SIGINT SIGTERM EXIT

trap "iscsicleanup; killprocess $iscsipid; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT

sleep 1



echo "Running FIO"