Commit ad783359 authored by Karol Latecki's avatar Karol Latecki Committed by Jim Harris
Browse files

scripts/nvmf_perf: copy SPDK from target early 



SPDK directory needs to be copied to initiator systems
earlier for set_irq_affinity to run.

Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Change-Id: I0f9ade02e58c9224e0b2ddc75117baaf653be614
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6776


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 02cb1fe8

scripts/perf/nvmf/run_nvmf.py

+17 −17
Original line number Diff line number Diff line
@@ -362,6 +362,10 @@ class Target(Server): 
        self.script_dir = os.path.dirname(os.path.abspath(sys.argv[0]))

        self.spdk_dir = os.path.abspath(os.path.join(self.script_dir, "../../../"))

        self.set_local_nic_info(self.set_local_nic_info_helper())



        if "skip_spdk_install" not in general_config or general_config["skip_spdk_install"] is False:

            self.zip_spdk_sources(self.spdk_dir, "/tmp/spdk.zip")



        self.configure_system()

        if self.enable_adq:

            self.configure_adq()
@@ -665,6 +669,9 @@ class Initiator(Server): 
        self.exec_cmd(["sudo", "rm", "-rf", "%s/nvmf_perf" % self.spdk_dir])

        self.exec_cmd(["mkdir", "-p", "%s" % self.spdk_dir])

        self._nics_json_obj = json.loads(self.exec_cmd(["ip", "-j", "address", "show"]))



        if "skip_spdk_install" not in general_config or general_config["skip_spdk_install"] is False:

            self.copy_spdk("/tmp/spdk.zip")

        self.set_local_nic_info(self.set_local_nic_info_helper())

        self.set_cpu_frequency()

        self.configure_system()
@@ -711,6 +718,13 @@ class Initiator(Server): 
        ftp.get(remote, local_dest)

        ftp.close()



    def copy_spdk(self, local_spdk_zip):

        self.log_print("Copying SPDK sources to initiator %s" % self.name)

        self.put_file(local_spdk_zip, "/tmp/spdk_drop.zip")

        self.log_print("Copied sources zip from target")

        self.exec_cmd(["unzip", "-qo", "/tmp/spdk_drop.zip", "-d", self.spdk_dir])

        self.log_print("Sources unpacked")



    def copy_result_files(self, dest_dir):

        self.log_print("Copying results")
@@ -1209,15 +1223,13 @@ class SPDKInitiator(Initiator): 
    def __init__(self, name, general_config, initiator_config):

        super(SPDKInitiator, self).__init__(name, general_config, initiator_config)



        if "skip_spdk_install" not in general_config or general_config["skip_spdk_install"] is False:

            self.install_spdk(self.spdk_dir)



        # Required fields

        self.num_cores = initiator_config["num_cores"]



    def install_spdk(self, local_spdk_zip):

        self.put_file(local_spdk_zip, "/tmp/spdk_drop.zip")

        self.log_print("Copied sources zip from target")

        self.exec_cmd(["unzip", "-qo", "/tmp/spdk_drop.zip", "-d", self.spdk_dir])



        self.log_print("Sources unpacked")

        self.log_print("Using fio binary %s" % self.fio_bin)

        self.exec_cmd(["git", "-C", self.spdk_dir, "submodule", "update", "--init"])

        self.exec_cmd(["git", "-C", self.spdk_dir, "clean", "-ffdx"])
@@ -1334,18 +1346,6 @@ if __name__ == "__main__": 
        else:

            continue



    # Copy and install SPDK on remote initiators

    if "skip_spdk_install" not in data["general"]:

        target_obj.zip_spdk_sources(target_obj.spdk_dir, spdk_zip_path)

        threads = []

        for i in initiators:

            if i.mode == "spdk":

                t = threading.Thread(target=i.install_spdk, args=(spdk_zip_path,))

                threads.append(t)

                t.start()

        for t in threads:

            t.join()



    target_obj.tgt_start()



    try: