From 6cebf49243cb3b8d70d113801f853d6a46f41336 Mon Sep 17 00:00:00 2001
From: Karol Latecki <karol.latecki@intel.com>
Date: Tue, 14 Jul 2020 12:09:54 +0200
Subject: [PATCH] test/nvme_perf: make fio log_avg_msec configurable

Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Change-Id: I92c7af88713ff4aa9e4a7cdf347ca06a303e5a07
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3334
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 test/nvme/perf/common.sh   | 3 +++
 test/nvme/perf/run_perf.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/nvme/perf/common.sh b/test/nvme/perf/common.sh
index 52dabd722..4206c0c2e 100755
--- a/test/nvme/perf/common.sh
+++ b/test/nvme/perf/common.sh
@@ -26,6 +26,7 @@ RUNTIME=600
 RAMP_TIME=30
 NUMJOBS=1
 REPEAT_NO=3
+SAMPLING_INT=0
 FIO_BIN=$CONFIG_FIO_SOURCE_DIR/fio
 PLUGIN="nvme"
 DISKCFG=""
@@ -506,6 +507,7 @@ function usage() {
 	echo "                          Applicable only for fio-based tests."
 	echo "    --repeat-no=INT       How many times to repeat workload test. [default=$REPEAT_NO]"
 	echo "                          Test result will be an average of repeated test runs."
+	echo "    --sampling-int=INT    Value for fio log_avg_msec parameters [default=$SAMPLING_INT]"
 	echo "    --fio-bin=PATH        Path to fio binary. [default=$FIO_BIN]"
 	echo "                          Applicable only for fio-based tests."
 	echo
@@ -550,6 +552,7 @@ while getopts 'h-:' optchar; do
 				ramp-time=*) RAMP_TIME="${OPTARG#*=}" ;;
 				numjobs=*) NUMJOBS="${OPTARG#*=}" ;;
 				repeat-no=*) REPEAT_NO="${OPTARG#*=}" ;;
+				sampling-int=*) SAMPLING_INT="${OPTARG#*=}" ;;
 				fio-bin=*) FIO_BIN="${OPTARG#*=}" ;;
 				driver=*) PLUGIN="${OPTARG#*=}" ;;
 				disk-config=*)
diff --git a/test/nvme/perf/run_perf.sh b/test/nvme/perf/run_perf.sh
index 8cb081357..9ca01b783 100755
--- a/test/nvme/perf/run_perf.sh
+++ b/test/nvme/perf/run_perf.sh
@@ -138,7 +138,7 @@ for ((j = 0; j < REPEAT_NO; j++)); do
 			numjobs=$NUMJOBS
 			time_based=1
 			description=$desc
-			log_avg_msec=250
+			log_avg_msec=$SAMPLING_INT
 		EOF
 
 		create_fio_config $DISKNO $PLUGIN "$DISK_NAMES" "$DISKS_NUMA" "$CORES"