From 0656ba9437d727e5533f14662d205ab890eed6d6 Mon Sep 17 00:00:00 2001 From: Piotr Pelplinski Date: Fri, 14 Dec 2018 11:09:22 +0100 Subject: [PATCH] histograms: tests for bdev histograms This patch adds tests for bdev histograms using bdevperf. Patch also adds bdev_rpc dependency in bdevrpc Makefile to enable histograms RPC calls in bdevperf. Signed-off-by: Piotr Pelplinski Change-Id: I1e0e94933936864df441e49f0016f9aa7705a7e2 Reviewed-on: https://review.gerrithub.io/c/437640 Tested-by: SPDK CI Jenkins Reviewed-by: Karol Latecki Reviewed-by: Darek Stojaczyk Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- test/bdev/bdevperf/Makefile | 2 +- test/blobstore/blob_io_wait/blob_io_wait.sh | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/test/bdev/bdevperf/Makefile b/test/bdev/bdevperf/Makefile index 4fd16159e..505f5712a 100644 --- a/test/bdev/bdevperf/Makefile +++ b/test/bdev/bdevperf/Makefile @@ -41,6 +41,6 @@ C_SRCS := bdevperf.c SPDK_LIB_LIST = $(ALL_MODULES_LIST) SPDK_LIB_LIST += event_bdev event_copy -SPDK_LIB_LIST += bdev copy event trace log conf thread util rpc jsonrpc json sock +SPDK_LIB_LIST += bdev copy event trace log conf thread util rpc bdev_rpc jsonrpc json sock include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/test/blobstore/blob_io_wait/blob_io_wait.sh b/test/blobstore/blob_io_wait/blob_io_wait.sh index b44a35254..812007000 100755 --- a/test/blobstore/blob_io_wait/blob_io_wait.sh +++ b/test/blobstore/blob_io_wait/blob_io_wait.sh @@ -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