test/iscsi: fix ext4test nightly

iSCSI target node was not deleted after error injection test.
Later in test this caused iscsiadm to connect to both EE target node
and to split nvme target node as they shared the same IP:PORT pair.

512MB malloc was too small to fit in spdk sources and compilation
products.

Fixes #642

Change-Id: I3d8ac6e1837cddad570f95263d3c6f529e64d5d8
Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.gerrithub.io/c/442867
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Paweł Niedźwiecki <pawelx.niedzwiecki@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Karol Latecki 2019-01-31 13:51:30 +01:00 committed by Darek Stojaczyk
parent 1982d4b1ad
commit 5305a49593

View File

@ -12,6 +12,7 @@ fi
timing_enter ext4test
rpc_py="$rootdir/scripts/rpc.py"
node_base="iqn.2013-06.com.intel.ch.spdk"
timing_enter start_iscsi_tgt
@ -22,7 +23,7 @@ echo "Process pid: $pid"
trap "$rpc_py destruct_split_vbdev Name0n1 || true; killprocess $pid; rm -f $testdir/iscsi.conf; exit 1" SIGINT SIGTERM EXIT
waitforlisten $pid
$rpc_py set_iscsi_options -o 30 -a 4 -b "iqn.2013-06.com.intel.ch.spdk"
$rpc_py set_iscsi_options -o 30 -a 4 -b $node_base
$rpc_py start_subsystem_init
$rootdir/scripts/gen_nvme.sh --json | $rpc_py load_subsystem_config
$rpc_py construct_malloc_bdev 512 4096 --name Malloc0
@ -64,10 +65,10 @@ else
fi
set -e
$rpc_py bdev_inject_error EE_Malloc0 'clear' 'failure'
echo "Error injection test done"
iscsicleanup
$rpc_py bdev_inject_error EE_Malloc0 'clear' 'failure'
$rpc_py delete_target_node $node_base:Target0
echo "Error injection test done"
if [ -z "$NO_NVME" ]; then
$rpc_py construct_split_vbdev Nvme0n1 2 -s 10000