051297114c
In iscsi_tgt tests, when error is caught by trap command, temporary files are not deleted. By this patch, delete temporary files in trap handlers. Change-Id: I317a102db346b345c3d25a4977528c737b861748 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/419311 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Ziye Yang <optimistyzy@gmail.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com> Reviewed-by: Seth Howell <seth.howell5141@gmail.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
109 lines
3.5 KiB
Bash
Executable File
109 lines
3.5 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
set -e
|
|
|
|
testdir=$(readlink -f $(dirname $0))
|
|
rootdir=$(readlink -f $testdir/../../..)
|
|
source $rootdir/test/common/autotest_common.sh
|
|
source $rootdir/test/nvmf/common.sh
|
|
source $rootdir/test/iscsi_tgt/common.sh
|
|
|
|
RDMA_IP_LIST=$(get_available_rdma_ips)
|
|
NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
|
|
if [ -z $NVMF_FIRST_TARGET_IP ]; then
|
|
echo "no NIC for nvmf test"
|
|
exit 0
|
|
fi
|
|
|
|
rpc_py="python $rootdir/scripts/rpc.py"
|
|
fio_py="python $rootdir/scripts/fio.py"
|
|
|
|
NVMF_PORT=4420
|
|
|
|
# Namespaces are NOT used here on purpose. Rxe_cfg utilility used for NVMf tests do not support namespaces.
|
|
TARGET_IP=127.0.0.1
|
|
INITIATOR_IP=127.0.0.1
|
|
NETMASK=$INITIATOR_IP/32
|
|
|
|
function run_nvme_remote() {
|
|
echo "now use $1 method to run iscsi tgt."
|
|
cp $testdir/iscsi.conf $testdir/iscsi.conf.tmp
|
|
|
|
if [ "$1" = "remote" ]; then
|
|
echo "[NVMe]" >> $testdir/iscsi.conf.tmp
|
|
echo " HostNQN nqn.2016-06.io.spdk:host1" >> $testdir/iscsi.conf.tmp
|
|
echo " TransportID \"trtype:RDMA adrfam:ipv4 traddr:$NVMF_FIRST_TARGET_IP trsvcid:4420 subnqn:nqn.2016-06.io.spdk:cnode1\" Nvme0" >> $testdir/iscsi.conf.tmp
|
|
fi
|
|
# Start the iSCSI target without using stub
|
|
iscsi_rpc_addr="/var/tmp/spdk-iscsi.sock"
|
|
ISCSI_APP="$rootdir/app/iscsi_tgt/iscsi_tgt"
|
|
$ISCSI_APP -r "$iscsi_rpc_addr" -c $testdir/iscsi.conf.tmp -m 0x1 -p 0 -s 512 &
|
|
iscsipid=$!
|
|
echo "iSCSI target launched. pid: $iscsipid"
|
|
trap "killprocess $iscsipid; killprocess $nvmfpid; rm -f $testdir/iscsi.conf.tmp; exit 1" SIGINT SIGTERM EXIT
|
|
waitforlisten $iscsipid "$iscsi_rpc_addr"
|
|
echo "iSCSI target has started."
|
|
|
|
timing_exit start_iscsi_tgt
|
|
|
|
echo "Creating an iSCSI target node."
|
|
$rpc_py -s "$iscsi_rpc_addr" add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
|
|
$rpc_py -s "$iscsi_rpc_addr" add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
|
|
if [ "$1" = "local" ]; then
|
|
$rpc_py -s "$iscsi_rpc_addr" construct_nvme_bdev -b "Nvme0" -t "rdma" -f "ipv4" -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT -n nqn.2016-06.io.spdk:cnode1
|
|
fi
|
|
$rpc_py -s "$iscsi_rpc_addr" construct_target_node Target1 Target1_alias 'Nvme0n1:0' $PORTAL_TAG:$INITIATOR_TAG 64 -d
|
|
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
|
|
}
|
|
|
|
timing_enter nvme_remote
|
|
|
|
# Start the NVMf target
|
|
NVMF_APP="$rootdir/app/nvmf_tgt/nvmf_tgt"
|
|
$NVMF_APP -c $rootdir/test/nvmf/nvmf.conf -m 0x2 -p 1 -s 512 &
|
|
nvmfpid=$!
|
|
echo "NVMf target launched. pid: $nvmfpid"
|
|
trap "killprocess $nvmfpid; rm -f $testdir/iscsi.conf.tmp; exit 1" SIGINT SIGTERM EXIT
|
|
waitforlisten $nvmfpid
|
|
echo "NVMf target has started."
|
|
bdevs=$($rpc_py construct_malloc_bdev 64 512)
|
|
$rpc_py construct_nvmf_subsystem nqn.2016-06.io.spdk:cnode1 "trtype:RDMA traddr:$NVMF_FIRST_TARGET_IP trsvcid:4420" "" -a -s SPDK00000000000001 -n "$bdevs"
|
|
echo "NVMf subsystem created."
|
|
|
|
timing_enter start_iscsi_tgt
|
|
|
|
run_nvme_remote "local"
|
|
|
|
trap "iscsicleanup; killprocess $iscsipid; killprocess $nvmfpid; rm -f $testdir/iscsi.conf.tmp; \
|
|
rm -f ./local-job0-0-verify.state; exit 1" SIGINT SIGTERM EXIT
|
|
sleep 1
|
|
|
|
echo "Running FIO"
|
|
$fio_py 4096 1 randrw 1 verify
|
|
|
|
rm -f ./local-job0-0-verify.state
|
|
iscsicleanup
|
|
killprocess $iscsipid
|
|
rm -f $testdir/iscsi.conf.tmp
|
|
|
|
run_nvme_remote "remote"
|
|
|
|
echo "Running FIO"
|
|
$fio_py 4096 1 randrw 1 verify
|
|
|
|
rm -f ./local-job0-0-verify.state
|
|
trap - SIGINT SIGTERM EXIT
|
|
|
|
iscsicleanup
|
|
killprocess $iscsipid
|
|
rm -f $testdir/iscsi.conf.tmp
|
|
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
|
|
killprocess $nvmfpid
|
|
|
|
report_test_completion "iscsi_nvme_remote"
|
|
timing_exit nvme_remote
|