From 7c1e69b3fa5d894f62da989f867b7c59558896fc Mon Sep 17 00:00:00 2001 From: Maciej Wawryk Date: Fri, 3 Apr 2020 16:30:04 +0200 Subject: [PATCH] scripts/nvmf: Fix subsystem divide and format error Signed-off-by: Maciej Wawryk Change-Id: I874c3a28c453737d0ba6ab42ec0d0a9fbc4719f7 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1679 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- scripts/perf/nvmf/run_nvmf.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/perf/nvmf/run_nvmf.py b/scripts/perf/nvmf/run_nvmf.py index 5d22e14fe9..c7dd05722f 100755 --- a/scripts/perf/nvmf/run_nvmf.py +++ b/scripts/perf/nvmf/run_nvmf.py @@ -338,6 +338,8 @@ runtime={run_time} for cpu in cpus: if "-" in cpu: a, b = cpu.split("-") + a = int(a) + b = int(b) cpus_num += len(range(a, b)) else: cpus_num += 1 @@ -690,7 +692,7 @@ class KernelInitiator(Initiator): remainder = len(nvme_list) % threads iterator = iter(filenames) result = [] - for i in range(threads): + for i in range(len(threads)): result.append([]) for j in range(nvme_per_split): result[i].append(next(iterator)) @@ -743,12 +745,14 @@ class SPDKInitiator(Initiator): def gen_fio_filename_conf(self, subsystems, threads): filename_section = "" - filenames = ["Nvme%sn1" % x for x in range(0, subsystems)] - nvme_per_split = int(subsystems / threads) - remainder = subsystems % threads + if len(threads) >= len(subsystems): + threads = range(0, len(subsystems)) + filenames = ["Nvme%sn1" % x for x in range(0, len(subsystems))] + nvme_per_split = int(len(subsystems) / len(threads)) + remainder = len(subsystems) % len(threads) iterator = iter(filenames) result = [] - for i in range(threads): + for i in range(len(threads)): result.append([]) for j in range(nvme_per_split): result[i].append(next(iterator))