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

perf/nvmf: replace bdev INI configs with JSON

Browse Source 
INI is deprecated, use JSON configs for fio plugin instead.

Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Change-Id: I3075e79ed7601116e837536a818821372362eb8d
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4762
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Michal Berger <michalx.berger@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Karol Latecki 2020-10-19 13:20:57 +02:00 committed by Tomasz Zawadzki
parent 74f8f3712c
commit dc45a73d9e
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -384,7 +384,7 @@ runtime={run_time}
bdev_conf = self.gen_spdk_bdev_conf(subsystems) bdev_conf = self.gen_spdk_bdev_conf(subsystems)
self.remote_call("echo '%s' > %s/bdev.conf" % (bdev_conf, self.spdk_dir)) self.remote_call("echo '%s' > %s/bdev.conf" % (bdev_conf, self.spdk_dir))
ioengine = "%s/build/fio/spdk_bdev" % self.spdk_dir ioengine = "%s/build/fio/spdk_bdev" % self.spdk_dir
spdk_conf = "spdk_conf=%s/bdev.conf" % self.spdk_dir spdk_conf = "spdk_json_conf=%s/bdev.conf" % self.spdk_dir
else: else:
ioengine = "libaio" ioengine = "libaio"
spdk_conf = "" spdk_conf = ""
@ -778,17 +778,31 @@ class SPDKInitiator(Initiator):
self.remote_call("sudo %s/scripts/setup.sh" % self.spdk_dir) self.remote_call("sudo %s/scripts/setup.sh" % self.spdk_dir)
def gen_spdk_bdev_conf(self, remote_subsystem_list): def gen_spdk_bdev_conf(self, remote_subsystem_list):
header = "[Nvme]" bdev_cfg_section = {
row_template = """ TransportId "trtype:{transport} adrfam:IPv4 traddr:{ip} trsvcid:{svc} subnqn:{nqn}" Nvme{i}""" "subsystems": [
{
"subsystem": "bdev",
"config": []
}
]
}
bdev_rows = [row_template.format(transport=self.transport, for i, subsys in enumerate(remote_subsystem_list):
svc=x[0], sub_port, sub_nqn, sub_addr = map(lambda x: str(x), subsys)
nqn=x[1], nvme_ctrl = {
ip=x[2], "method": "bdev_nvme_attach_controller",
i=i) for i, x in enumerate(remote_subsystem_list)] "params": {
bdev_rows = "\n".join(bdev_rows) "name": "Nvme{}".format(i),
bdev_section = "\n".join([header, bdev_rows]) "trtype": self.transport,
return bdev_section "traddr": sub_addr,
"trsvcid": sub_port,
"subnqn": sub_nqn,
"adrfam": "IPv4"
}
}
bdev_cfg_section["subsystems"][0]["config"].append(nvme_ctrl)
return json.dumps(bdev_cfg_section, indent=2)
def gen_fio_filename_conf(self, subsystems, threads, io_depth, num_jobs=1): def gen_fio_filename_conf(self, subsystems, threads, io_depth, num_jobs=1):
filename_section = "" filename_section = ""