From 9a028f88ac48c87c56cc48109b02b5b9213c9ee5 Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Fri, 23 Sep 2022 08:58:36 +0200 Subject: [PATCH] scripts/perf_nvmf: fix Kernel Initiator regex issue Get full regex match using ".group(0)" method. Otherwise a non-iterable MatchObject is passed to get_route_nic_numa() which causes an exception. Signed-off-by: Karol Latecki Change-Id: Ief8b08387e4233d42b5ac32bd4d7394596aabd78 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14649 Tested-by: SPDK CI Jenkins Reviewed-by: Konrad Sztyber Reviewed-by: Pawel Piatek Reviewed-by: Michal Berger Reviewed-by: Tomasz Zawadzki --- scripts/perf/nvmf/run_nvmf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/perf/nvmf/run_nvmf.py b/scripts/perf/nvmf/run_nvmf.py index 08e979887..3935fd812 100755 --- a/scripts/perf/nvmf/run_nvmf.py +++ b/scripts/perf/nvmf/run_nvmf.py @@ -1414,7 +1414,7 @@ class KernelInitiator(Initiator): nvme_ctrl = os.path.basename(dev_name)[:-2] remote_nvme_ip = re.search(r'(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})', self.exec_cmd(["cat", "/sys/class/nvme/%s/address" % nvme_ctrl])) - return self.get_route_nic_numa(remote_nvme_ip) + return self.get_route_nic_numa(remote_nvme_ip.group(0)) def gen_fio_filename_conf(self, threads, io_depth, num_jobs=1, offset=False, offset_inc=0): # Generate connected nvme devices names and sort them by used NIC numa node