Commit 894360fb authored by Karol Latecki's avatar Karol Latecki Committed by Konrad Sztyber
Browse files

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: default avatarKarol Latecki <karol.latecki@intel.com>
Change-Id: Id6874ee8614aefdd9ee4a55dd200a6deab504b7a
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14881


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarMichal Berger <michal.berger@intel.com>
parent da55cb87

scripts/perf/nvmf/run_nvmf.py

+5 −3
Original line number Diff line number Diff line
@@ -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)