From 50ba256727ce588a57df0c42679304d33f8a364b Mon Sep 17 00:00:00 2001
From: GangCao <gang.cao@intel.com>
Date: Mon, 11 Oct 2021 17:12:32 -0400
Subject: [PATCH] bdevperf: properly handle the next run of perform_tests

Change-Id: I65060a3a3f254ef541ab2f65995f168f649fbf69
Signed-off-by: GangCao <gang.cao@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9821
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 test/bdev/bdevperf/bdevperf.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/test/bdev/bdevperf/bdevperf.c b/test/bdev/bdevperf/bdevperf.c
index 4f41d0955..90ed55a48 100644
--- a/test/bdev/bdevperf/bdevperf.c
+++ b/test/bdev/bdevperf/bdevperf.c
@@ -1887,6 +1887,9 @@ rpc_perform_tests_cb(void)
 
 	/* Reset g_run_rc to 0 for the next test run. */
 	g_run_rc = 0;
+
+	/* Reset g_stats to 0 for the next test run. */
+	memset(&g_stats, 0, sizeof(g_stats));
 }
 
 static void
@@ -1905,7 +1908,12 @@ rpc_perform_tests(struct spdk_jsonrpc_request *request, const struct spdk_json_v
 	}
 	g_request = request;
 
-	bdevperf_construct_job_configs();
+	/* Only construct job configs at the first test run.  */
+	if (TAILQ_EMPTY(&job_config_list)) {
+		bdevperf_construct_job_configs();
+	} else {
+		bdevperf_construct_jobs();
+	}
 }
 SPDK_RPC_REGISTER("perform_tests", rpc_perform_tests, SPDK_RPC_RUNTIME)