From fa540f18d8d0283cff24a14389b11941b6c7018b Mon Sep 17 00:00:00 2001
From: Vitaliy Mysak <vitaliy.mysak@intel.com>
Date: Wed, 13 Nov 2019 09:20:03 +0100
Subject: [PATCH] test/ocf: split tests for io types and get_stats

In bdevperf-iotypes we used to call "bdev_ocf_get_stats" RPC
which is not a part of IO types testing.
As a result, we started to get failures caused by that rpc call which
were not related to ocf bdev IO handling (issue #1025).

This patch isolates the RPC call to separate test.

Change-Id: I3a72ef52452868d49a6ec1ae4d3f9643496c2a28
Signed-off-by: Vitaliy Mysak <vitaliy.mysak@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/474052
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
---
 test/ocf/integrity/bdevperf-iotypes.sh |  8 +-------
 test/ocf/integrity/stats.sh            | 15 +++++++++++++++
 test/ocf/ocf.sh                        |  1 +
 3 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100755 test/ocf/integrity/stats.sh

diff --git a/test/ocf/integrity/bdevperf-iotypes.sh b/test/ocf/integrity/bdevperf-iotypes.sh
index 206c3cba2..1e4de92e6 100755
--- a/test/ocf/integrity/bdevperf-iotypes.sh
+++ b/test/ocf/integrity/bdevperf-iotypes.sh
@@ -9,10 +9,4 @@ rpc_py="$rootdir/scripts/rpc.py"
 
 $bdevperf -c $curdir/mallocs.conf -q 128 -o 4096 -t 4 -w flush
 $bdevperf -c $curdir/mallocs.conf -q 128 -o 4096 -t 4 -w unmap
-
-$bdevperf -c $curdir/mallocs.conf -q 128 -o 4096 -t 4 -w write -r /var/tmp/spdk.sock &
-bdev_perf_pid=$!
-waitforlisten $bdev_perf_pid
-sleep 1
-$rpc_py bdev_ocf_get_stats MalCache1
-wait $bdev_perf_pid
+$bdevperf -c $curdir/mallocs.conf -q 128 -o 4096 -t 4 -w write
diff --git a/test/ocf/integrity/stats.sh b/test/ocf/integrity/stats.sh
new file mode 100755
index 000000000..bfe7c03b6
--- /dev/null
+++ b/test/ocf/integrity/stats.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+curdir=$(dirname $(readlink -f "$BASH_SOURCE"))
+rootdir=$(readlink -f $curdir/../../..)
+source $rootdir/test/common/autotest_common.sh
+
+bdevperf=$rootdir/test/bdev/bdevperf/bdevperf
+rpc_py="$rootdir/scripts/rpc.py"
+
+$bdevperf -c $curdir/mallocs.conf -q 128 -o 4096 -w write -t 120 -r /var/tmp/spdk.sock &
+bdev_perf_pid=$!
+waitforlisten $bdev_perf_pid
+sleep 1
+$rpc_py bdev_ocf_get_stats MalCache1
+killprocess $bdev_perf_pid
diff --git a/test/ocf/ocf.sh b/test/ocf/ocf.sh
index b257cc4ea..820b0f5f4 100755
--- a/test/ocf/ocf.sh
+++ b/test/ocf/ocf.sh
@@ -16,6 +16,7 @@ timing_enter ocf
 
 suite "$testdir/integrity/fio-modes.sh"
 suite "$testdir/integrity/bdevperf-iotypes.sh"
+suite "$testdir/integrity/stats.sh"
 suite "$testdir/management/create-destruct.sh"
 suite "$testdir/management/multicore.sh"
 suite "$testdir/management/persistent-metadata.sh"