d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "blockdev, nvme: test parsing device exported by NVMe-oF in conf"

Browse Source 
Seeing some intermittent test failures in the test pool related to this
patch.

This reverts commit 8912fc193f06607670f6c372118d71052a99c3f3.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: Ie81efec005da6b0d1074e8ecc073027b5d7fd7a8
Reviewed-on: https://review.gerrithub.io/366696
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Jim Harris 2017-06-22 15:42:58 -07:00 committed by Daniel Verkamp
parent d40b934652
commit 5b3bc8bd6e
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/iscsi_tgt/iscsi_tgt.sh
View File

@ -43,9 +43,6 @@ kill_stub
# TODO: enable remote NVMe controllers with multi-process so that
# we can use the stub for this test
#test configure remote NVMe device from rpc
run_test ./test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh 0
#test configure remote NVMe device from conf file
run_test ./test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh 1
run_test ./test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
timing_exit iscsi_tgt

13
test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
View File

@ -34,14 +34,8 @@ echo "NVMf subsystem created."
timing_enter start_iscsi_tgt
cp $testdir/iscsi.conf $testdir/iscsi.conf.tmp
if [ $1 -eq 1 ]; then
echo "[NVMe]" >> $testdir/iscsi.conf.tmp
echo " TransportID 'trtype:RDMA adrfam:ipv4 traddr:192.168.100.8 trsvcid:4420 subnqn:nqn.2016-06.io.spdk:cnode1' Nvme0" >> $testdir/iscsi.conf.tmp
fi
# Start the iSCSI target
$ISCSI_APP -c $testdir/iscsi.conf.tmp -m 0x1 -p 0 -s 512 &
$ISCSI_APP -c $testdir/iscsi.conf -m 0x1 -p 0 -s 512 &
iscsipid=$!
echo "iSCSI target launched. pid: $iscsipid"
trap "killprocess $iscsipid; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT
@ -54,9 +48,7 @@ timing_exit start_iscsi_tgt
echo "Creating an iSCSI target node."
$rpc_py -p 5261 add_portal_group 1 $TARGET_IP:$ISCSI_PORT
$rpc_py -p 5261 add_initiator_group 1 ALL $INITIATOR_IP/32
if [ $1 -eq 0 ]; then
$rpc_py -p 5261 construct_nvme_bdev -b "Nvme0" -t "rdma" -f "ipv4" -a 192.168.100.8 -s $NVMF_PORT -n nqn.2016-06.io.spdk:cnode1
fi
$rpc_py -p 5261 construct_nvme_bdev -b "Nvme0" -t "rdma" -f "ipv4" -a 192.168.100.8 -s $NVMF_PORT -n nqn.2016-06.io.spdk:cnode1
$rpc_py -p 5261 construct_target_node Target1 Target1_alias 'Nvme0n1:0' '1:1' 64 1 0 0 0
sleep 1
@ -74,7 +66,6 @@ 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