import 15.2.0 Octopus source

[ceph.git] / ceph / src / spdk / test / iscsi_tgt / digests / digests.sh

diff --git a/ceph/src/spdk/test/iscsi_tgt/digests/digests.sh b/ceph/src/spdk/test/iscsi_tgt/digests/digests.sh
index 675cf1c1e0664f4fa905243d8a93f79df9320967..40422269ef399c17f0df0ac484a4b7c60480bb32 100755 (executable)
--- a/ceph/src/spdk/test/iscsi_tgt/digests/digests.sh
+++ b/ceph/src/spdk/test/iscsi_tgt/digests/digests.sh
@@ -5,14 +5,17 @@ rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/iscsi_tgt/common.sh
 
+# $1 = "iso" - triggers isolation mode (setting up required environment).
+# $2 = test type posix or vpp. defaults to posix.
+iscsitestinit $1 $2
+
 function node_login_fio_logout() {
        for arg in "$@"; do
                iscsiadm -m node -p $TARGET_IP:$ISCSI_PORT -o update -n node.conn[0].iscsi.$arg
        done
        iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT
-       sleep 1
-       $fio_py 512 1 write 2
-       $fio_py 512 1 read 2
+       $fio_py -p iscsi -i 512 -d 1 -t write -r 2
+       $fio_py -p iscsi -i 512 -d 1 -t read -r 2
        iscsiadm -m node --logout -p $TARGET_IP:$ISCSI_PORT
        sleep 1
 }
@@ -67,7 +70,7 @@ $ISCSI_APP -m $ISCSI_TEST_CORE_MASK --wait-for-rpc &
 pid=$!
 echo "Process pid: $pid"
 
-trap "killprocess $pid; exit 1" SIGINT SIGTERM EXIT
+trap "killprocess $pid; iscsitestfini $1 $2; exit 1" SIGINT SIGTERM EXIT
 
 waitforlisten $pid
 $rpc_py set_iscsi_options -o 30 -a 16
@@ -101,4 +104,5 @@ trap - SIGINT SIGTERM EXIT
 
 iscsicleanup
 killprocess $pid
+iscsitestfini $1 $2
 timing_exit digests