From 51f411c213abd5522018d3259f7030abb6628f54 Mon Sep 17 00:00:00 2001 From: Pawel Kaminski Date: Tue, 19 Feb 2019 07:24:41 -0500 Subject: [PATCH] test/iscsi_tgt: Use rpc instead of config file. Remove unnecessary rm commands. Change-Id: I2bf0da376c8ea492a74deb8c523773e30e199bdc Signed-off-by: Pawel Kaminski Reviewed-on: https://review.gerrithub.io/c/445304 Tested-by: SPDK CI Jenkins Reviewed-by: Karol Latecki Reviewed-by: Darek Stojaczyk Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- test/iscsi_tgt/ext4test/ext4test.sh | 4 ++-- test/iscsi_tgt/perf/iscsi.conf | 10 ---------- test/iscsi_tgt/perf/iscsi_target.sh | 4 +++- 3 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 test/iscsi_tgt/perf/iscsi.conf diff --git a/test/iscsi_tgt/ext4test/ext4test.sh b/test/iscsi_tgt/ext4test/ext4test.sh index 6ee4a273e..04262dc0b 100755 --- a/test/iscsi_tgt/ext4test/ext4test.sh +++ b/test/iscsi_tgt/ext4test/ext4test.sh @@ -20,7 +20,7 @@ $ISCSI_APP --wait-for-rpc & pid=$! echo "Process pid: $pid" -trap "$rpc_py destruct_split_vbdev Name0n1 || true; killprocess $pid; rm -f $testdir/iscsi.conf; exit 1" SIGINT SIGTERM EXIT +trap "$rpc_py destruct_split_vbdev Name0n1 || true; killprocess $pid; exit 1" SIGINT SIGTERM EXIT waitforlisten $pid $rpc_py set_iscsi_options -o 30 -a 4 -b $node_base @@ -44,7 +44,7 @@ iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$ISCSI_PORT iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT trap 'for new_dir in `dir -d /mnt/*dir`; do umount $new_dir; rm -rf $new_dir; done; \ - iscsicleanup; killprocess $pid; rm -f $testdir/iscsi.conf; exit 1' SIGINT SIGTERM EXIT + iscsicleanup; killprocess $pid; exit 1' SIGINT SIGTERM EXIT sleep 1 diff --git a/test/iscsi_tgt/perf/iscsi.conf b/test/iscsi_tgt/perf/iscsi.conf deleted file mode 100644 index 432768819..000000000 --- a/test/iscsi_tgt/perf/iscsi.conf +++ /dev/null @@ -1,10 +0,0 @@ -[Global] - -[iSCSI] - NodeBase "iqn.2016-06.io.spdk" - AuthFile /usr/local/etc/spdk/auth.conf - Timeout 30 - DiscoveryAuthMethod Auto - MaxSessions 16 - ImmediateData Yes - ErrorRecoveryLevel 0 diff --git a/test/iscsi_tgt/perf/iscsi_target.sh b/test/iscsi_tgt/perf/iscsi_target.sh index 5438cd4a6..e4748540e 100755 --- a/test/iscsi_tgt/perf/iscsi_target.sh +++ b/test/iscsi_tgt/perf/iscsi_target.sh @@ -80,10 +80,12 @@ mkdir -p $testdir/perf_output touch $iscsi_fio_results timing_enter run_iscsi_app -$rootdir/app/iscsi_tgt/iscsi_tgt -m $ISCSI_TGT_CM -r $testdir/rpc_iscsi.sock -c $testdir/iscsi.conf & +$rootdir/app/iscsi_tgt/iscsi_tgt -m $ISCSI_TGT_CM -r $testdir/rpc_iscsi.sock --wait-for-rpc & pid=$! trap "rm -f $testdir/perf.job; killprocess $pid; print_backtrace; exit 1" ERR SIGTERM SIGABRT waitforlisten "$pid" "$testdir/rpc_iscsi.sock" +$rpc_py set_iscsi_options -b "iqn.2016-06.io.spdk" -f "/usr/local/etc/spdk/auth.conf" -o 30 -i -l 0 -a 16 +$rpc_py start_subsystem_init $rootdir/scripts/gen_nvme.sh --json | $rpc_py load_subsystem_config sleep 1 timing_exit run_iscsi_app