update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / test / nvmf / target / srq_overwhelm.sh

diff --git a/ceph/src/spdk/test/nvmf/target/srq_overwhelm.sh b/ceph/src/spdk/test/nvmf/target/srq_overwhelm.sh
index dea8bcfb071bfa4f3dbe0a55db4454902ffc1daa..fe4dd7d2909df21510a15426f86de19b467f0821 100755 (executable)
--- a/ceph/src/spdk/test/nvmf/target/srq_overwhelm.sh
+++ b/ceph/src/spdk/test/nvmf/target/srq_overwhelm.sh
@@ -10,9 +10,6 @@ MALLOC_BLOCK_SIZE=512
 
 rpc_py="$rootdir/scripts/rpc.py"
 
-set -e
-
-timing_enter srq_overwhelm
 nvmftestinit
 
 if check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then
@@ -20,14 +17,14 @@ if check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then
        exit 0
 fi
 
-nvmfappstart "-m 0xF"
+nvmfappstart -m 0xF
 
 # create the rdma transport with an intentionally small SRQ depth
-$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192 -s 1024
+$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192 -s 1024
 
 for i in $(seq 0 5); do
-       $rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode$i -a -s SPDK00000000000001
-       $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc$i
+       $rpc_py nvmf_create_subsystem nqn.2016-06.io.spdk:cnode$i -a -s SPDK00000000000001
+       $rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc$i
        $rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode$i Malloc$i
        $rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode$i -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT
        nvme connect -t $TEST_TRANSPORT -n "nqn.2016-06.io.spdk:cnode${i}" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT" -i 16
@@ -45,11 +42,9 @@ sync
 
 for i in $(seq 0 5); do
        nvme disconnect -n "nqn.2016-06.io.spdk:cnode${i}"
-       $rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode$i
+       $rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode$i
 done
 
 trap - SIGINT SIGTERM EXIT
 
-nvmfcleanup
 nvmftestfini
-timing_exit srq_overwhelm