From 894360fbf284c0d26a9b77511c5a5f18525ddf3e Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Thu, 6 Oct 2022 12:48:24 +0200 Subject: [PATCH] scripts/nvmf_perf: make Initiator num_cores actually optional "num_cores" is described as optional in readme file. For SPDK Initiator class it was required instead of optional, and Kernel Initiator did not even take this parameter into consideration. Signed-off-by: Karol Latecki Change-Id: Id6874ee8614aefdd9ee4a55dd200a6deab504b7a Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14881 Tested-by: SPDK CI Jenkins Reviewed-by: Konrad Sztyber Reviewed-by: Tomasz Zawadzki Reviewed-by: Michal Berger --- scripts/perf/nvmf/run_nvmf.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/perf/nvmf/run_nvmf.py b/scripts/perf/nvmf/run_nvmf.py index e5fd95453..3f87f98bd 100755 --- a/scripts/perf/nvmf/run_nvmf.py +++ b/scripts/perf/nvmf/run_nvmf.py @@ -1219,6 +1219,9 @@ class KernelInitiator(Initiator): self.extra_params = "" self.ioengine = "libaio" + if "num_cores" in initiator_config: + self.num_cores = initiator_config["num_cores"] + if "extra_params" in initiator_config: self.extra_params = initiator_config["extra_params"] @@ -1322,13 +1325,12 @@ class SPDKInitiator(Initiator): if "skip_spdk_install" not in general_config or general_config["skip_spdk_install"] is False: self.install_spdk() - # Required fields - self.num_cores = initiator_config["num_cores"] - # Optional fields self.enable_data_digest = False if "enable_data_digest" in initiator_config: self.enable_data_digest = initiator_config["enable_data_digest"] + if "num_cores" in initiator_config: + self.num_cores = initiator_config["num_cores"] def install_spdk(self): self.log.info("Using fio binary %s" % self.fio_bin)