ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts/perf: clean up constructor parameters

Browse Source 
Move code around so that lines containing arguments
for constructors are better aligned with how they're
inherited.

Change nvmet_dir and fio_dir to nvmet_bin and fio_bin to
point directly to executable files. There is no advantage
in using directories.
Additionally fix how fio_bin (previously fio_dir) is passed
to parent classes - it was broken and caused exceptions.

Update README.md accordingly.

Change-Id: I10524593d543e236bf318a8cd51ea5375c334e8b
Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/477015
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Reviewed-by: Pawel Kaminski <pawelx.kaminski@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Karol Latecki 2019-12-06 10:19:42 +01:00 committed by Tomasz Zawadzki
parent 28d901c8d7
commit 9dfe2a4bce
2 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/perf/nvmf/README.md
View File

@ -29,8 +29,8 @@ in Test Case 3 of performance report.
### num_cores ### num_cores
List of CPU cores to assign for running SPDK NVMe-OF Target process. Can specify exact core numbers or ranges, eg: List of CPU cores to assign for running SPDK NVMe-OF Target process. Can specify exact core numbers or ranges, eg:
[0, 1, 10-15]. [0, 1, 10-15].
### nvmet_dir ### nvmet_bin
Path to directory with nvmetcli application. If not provided then system-wide package will be used Path to nvmetcli application executable. If not provided then system-wide package will be used
by default. Not used if "mode" is set to "spdk". by default. Not used if "mode" is set to "spdk".
### num_shared_buffers ### num_shared_buffers
Number of shared buffers to use when creating transport layer. Number of shared buffers to use when creating transport layer.
@ -51,9 +51,9 @@ If not specified then by default each connected subsystem gets its own CPU core.
### nvmecli_dir ### nvmecli_dir
Path to directory with nvme-cli application. If not provided then system-wide package will be used Path to directory with nvme-cli application. If not provided then system-wide package will be used
by default. Not used if "mode" is set to "spdk". by default. Not used if "mode" is set to "spdk".
### fio_dir ### fio_bin
Path to the fio binary that will be used to compile SPDK and run the test. Path to the fio binary that will be used to compile SPDK and run the test.
If not specified, then the script will use /usr/src/fio as the default. If not specified, then the script will use /usr/src/fio/fio as the default.
## fio ## fio
Fio job parameters. Fio job parameters.

71
scripts/perf/nvmf/run_nvmf.py
View File

@ -34,7 +34,9 @@ class Server:
class Target(Server): class Target(Server):
def __init__(self, name, username, password, mode, nic_ips, transport="rdma", use_null_block=False, sar_settings=None): def __init__(self, name, username, password, mode, nic_ips, transport="rdma",
use_null_block=False, sar_settings=None):
super(Target, self).__init__(name, username, password, mode, nic_ips, transport) super(Target, self).__init__(name, username, password, mode, nic_ips, transport)
self.null_block = bool(use_null_block) self.null_block = bool(use_null_block)
self.enable_sar = False self.enable_sar = False
@ -176,18 +178,15 @@ class Target(Server):
class Initiator(Server): class Initiator(Server):
def __init__(self, name, username, password, mode, nic_ips, ip, transport="rdma", nvmecli_dir=None, workspace="/tmp/spdk", def __init__(self, name, username, password, mode, nic_ips, ip, transport="rdma",
fio_dir="/usr/src/fio"): nvmecli_bin="nvme", workspace="/tmp/spdk", fio_bin="/usr/src/fio/fio"):
super(Initiator, self).__init__(name, username, password, mode, nic_ips, transport) super(Initiator, self).__init__(name, username, password, mode, nic_ips, transport)
self.ip = ip self.ip = ip
self.spdk_dir = workspace self.spdk_dir = workspace
self.fio_dir = fio_dir self.fio_bin = fio_bin
self.nvmecli_bin = nvmecli_bin
if nvmecli_dir:
self.nvmecli_bin = os.path.join(nvmecli_dir, "nvme")
else:
self.nvmecli_bin = "nvme" # Use system-wide nvme-cli
self.ssh_connection = paramiko.SSHClient() self.ssh_connection = paramiko.SSHClient()
self.ssh_connection.set_missing_host_key_policy(paramiko.AutoAddPolicy()) self.ssh_connection.set_missing_host_key_policy(paramiko.AutoAddPolicy())
self.ssh_connection.connect(self.ip, username=self.username, password=self.password) self.ssh_connection.connect(self.ip, username=self.username, password=self.password)
@ -309,18 +308,17 @@ runtime={run_time}
def run_fio(self, fio_config_file, run_num=None): def run_fio(self, fio_config_file, run_num=None):
job_name, _ = os.path.splitext(fio_config_file) job_name, _ = os.path.splitext(fio_config_file)
self.log_print("Starting FIO run for job: %s" % job_name) self.log_print("Starting FIO run for job: %s" % job_name)
fio_bin = os.path.join(self.fio_dir, "fio") self.log_print("Using FIO: %s" % self.fio_bin)
self.log_print("Using FIO: %s" % fio_bin)
if run_num: if run_num:
for i in range(1, run_num + 1): for i in range(1, run_num + 1):
output_filename = job_name + "_run_" + str(i) + "_" + self.name + ".json" output_filename = job_name + "_run_" + str(i) + "_" + self.name + ".json"
cmd = "sudo %s %s --output-format=json --output=%s" % (fio_bin, fio_config_file, output_filename) cmd = "sudo %s %s --output-format=json --output=%s" % (self.fio_bin, fio_config_file, output_filename)
output, error = self.remote_call(cmd) output, error = self.remote_call(cmd)
self.log_print(output) self.log_print(output)
self.log_print(error) self.log_print(error)
else: else:
output_filename = job_name + "_" + self.name + ".json" output_filename = job_name + "_" + self.name + ".json"
cmd = "sudo %s %s --output-format=json --output=%s" % (fio_bin, fio_config_file, output_filename) cmd = "sudo %s %s --output-format=json --output=%s" % (self.fio_bin, fio_config_file, output_filename)
output, error = self.remote_call(cmd) output, error = self.remote_call(cmd)
self.log_print(output) self.log_print(output)
self.log_print(error) self.log_print(error)
@ -328,15 +326,13 @@ runtime={run_time}
class KernelTarget(Target): class KernelTarget(Target):
def __init__(self, name, username, password, mode, nic_ips, def __init__(self, name, username, password, mode, nic_ips, transport="rdma",
use_null_block=False, sar_settings=None, transport="rdma", nvmet_dir=None, **kwargs): use_null_block=False, sar_settings=None,
super(KernelTarget, self).__init__(name, username, password, mode, nic_ips, nvmet_bin="nvmetcli", **kwargs):
transport, use_null_block, sar_settings)
if nvmet_dir: super(KernelTarget, self).__init__(name, username, password, mode, nic_ips, transport,
self.nvmet_bin = os.path.join(nvmet_dir, "nvmetcli") use_null_block, sar_settings)
else: self.nvmet_bin = nvmet_bin
self.nvmet_bin = "nvmetcli"
def __del__(self): def __del__(self):
nvmet_command(self.nvmet_bin, "clear") nvmet_command(self.nvmet_bin, "clear")
@ -457,9 +453,13 @@ class KernelTarget(Target):
class SPDKTarget(Target): class SPDKTarget(Target):
def __init__(self, name, username, password, mode, nic_ips, num_cores, num_shared_buffers=4096,
use_null_block=False, sar_settings=None, transport="rdma", **kwargs): def __init__(self, name, username, password, mode, nic_ips, transport="rdma",
super(SPDKTarget, self).__init__(name, username, password, mode, nic_ips, transport, use_null_block, sar_settings) use_null_block=False, sar_settings=None,
num_shared_buffers=4096, num_cores=1, **kwargs):
super(SPDKTarget, self).__init__(name, username, password, mode, nic_ips, transport,
use_null_block, sar_settings)
self.num_cores = num_cores self.num_cores = num_cores
self.num_shared_buffers = num_shared_buffers self.num_shared_buffers = num_shared_buffers
@ -567,8 +567,11 @@ class SPDKTarget(Target):
class KernelInitiator(Initiator): class KernelInitiator(Initiator):
def __init__(self, name, username, password, mode, nic_ips, ip, transport, **kwargs): def __init__(self, name, username, password, mode, nic_ips, ip, transport,
super(KernelInitiator, self).__init__(name, username, password, mode, nic_ips, ip, transport, fio_dir) fio_bin="/usr/src/fio/fio", **kwargs):
super(KernelInitiator, self).__init__(name, username, password, mode, nic_ips, ip, transport,
fio_bin=fio_bin)
def __del__(self): def __del__(self):
self.ssh_connection.close() self.ssh_connection.close()
@ -601,10 +604,12 @@ class KernelInitiator(Initiator):
class SPDKInitiator(Initiator): class SPDKInitiator(Initiator):
def __init__(self, name, username, password, mode, nic_ips, ip, num_cores=None, transport="rdma", **kwargs): def __init__(self, name, username, password, mode, nic_ips, ip, transport="rdma",
super(SPDKInitiator, self).__init__(name, username, password, mode, nic_ips, ip, transport, fio_dir) num_cores=1, fio_bin="/usr/src/fio/fio", **kwargs):
if num_cores: super(SPDKInitiator, self).__init__(name, username, password, mode, nic_ips, ip, transport,
self.num_cores = num_cores fio_bin=fio_bin)
self.num_cores = num_cores
def install_spdk(self, local_spdk_zip): def install_spdk(self, local_spdk_zip):
self.put_file(local_spdk_zip, "/tmp/spdk_drop.zip") self.put_file(local_spdk_zip, "/tmp/spdk_drop.zip")
@ -612,9 +617,9 @@ class SPDKInitiator(Initiator):
self.remote_call("unzip -qo /tmp/spdk_drop.zip -d %s" % self.spdk_dir) self.remote_call("unzip -qo /tmp/spdk_drop.zip -d %s" % self.spdk_dir)
self.log_print("Sources unpacked") self.log_print("Sources unpacked")
self.log_print("Using fio directory %s" % self.fio_dir) self.log_print("Using fio binary %s" % self.fio_bin)
self.remote_call("cd %s; git submodule update --init; ./configure --with-rdma --with-fio=%s;" self.remote_call("cd %s; git submodule update --init; ./configure --with-rdma --with-fio=%s;"
"make clean; make -j$(($(nproc)*2))" % (self.spdk_dir, self.fio_dir)) "make clean; make -j$(($(nproc)*2))" % (self.spdk_dir, os.path.dirname(self.fio_bin)))
self.log_print("SPDK built") self.log_print("SPDK built")
self.remote_call("sudo %s/scripts/setup.sh" % self.spdk_dir) self.remote_call("sudo %s/scripts/setup.sh" % self.spdk_dir)