import 15.2.0 Octopus source

[ceph.git] / ceph / src / spdk / test / blobstore / blob_io_wait / blob_io_wait.sh

diff --git a/ceph/src/spdk/test/blobstore/blob_io_wait/blob_io_wait.sh b/ceph/src/spdk/test/blobstore/blob_io_wait/blob_io_wait.sh
index b44a352544284a5432370dea58daa150bcc66f5e..8ce3cc878cf9032cc3b8cfba1397ce10b66fd244 100755 (executable)
--- a/ceph/src/spdk/test/blobstore/blob_io_wait/blob_io_wait.sh
+++ b/ceph/src/spdk/test/blobstore/blob_io_wait/blob_io_wait.sh
@@ -10,7 +10,7 @@ testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/nvmf/common.sh
-rpc_py="python $rootdir/scripts/rpc.py"
+rpc_py="$rootdir/scripts/rpc.py"
 set -e
 
 timing_enter blob_bdev_io_wait
@@ -36,8 +36,24 @@ echo "BdevIoCacheSize 1" >> $testdir/bdevperf.conf
 echo "[AIO]" >> $testdir/bdevperf.conf
 echo "AIO $testdir/aio.bdev aio0 4096" >> $testdir/bdevperf.conf
 
-$rootdir/test/bdev/bdevperf/bdevperf -c $testdir/bdevperf.conf -q 128 -o 4096 -w write -t 1
-$rootdir/test/bdev/bdevperf/bdevperf -c $testdir/bdevperf.conf -q 128 -o 4096 -w read -t 1
+$rootdir/test/bdev/bdevperf/bdevperf -c $testdir/bdevperf.conf -q 128 -o 4096 -w write -t 5 -r /var/tmp/spdk.sock &
+bdev_perf_pid=$!
+waitforlisten $bdev_perf_pid
+$rpc_py enable_bdev_histogram aio0 -e
+sleep 2
+$rpc_py get_bdev_histogram aio0 | $rootdir/scripts/histogram.py
+$rpc_py enable_bdev_histogram aio0 -d
+wait $bdev_perf_pid
+
+$rootdir/test/bdev/bdevperf/bdevperf -c $testdir/bdevperf.conf -q 128 -o 4096 -w read -t 5 -r /var/tmp/spdk.sock &
+bdev_perf_pid=$!
+waitforlisten $bdev_perf_pid
+$rpc_py enable_bdev_histogram aio0 -e
+sleep 2
+$rpc_py get_bdev_histogram aio0 | $rootdir/scripts/histogram.py
+$rpc_py enable_bdev_histogram aio0 -d
+wait $bdev_perf_pid
+
 $rootdir/test/bdev/bdevperf/bdevperf -c $testdir/bdevperf.conf -q 128 -o 4096 -w unmap -t 1
 
 sync