From 6f702d4ea75f6c04f6619ac517c7b7774542a064 Mon Sep 17 00:00:00 2001 From: Maciej Wawryk Date: Thu, 7 May 2020 12:37:17 +0200 Subject: [PATCH] scripts/perf: Fix type error in run_nvmf.py TypeError: unsupported operand type(s) for /: 'int' and 'range' Signed-off-by: Maciej Wawryk Change-Id: I8266c80cc886a51b43d9719b8bf845ffd0730b03 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2259 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Karol Latecki Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris --- scripts/perf/nvmf/run_nvmf.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/perf/nvmf/run_nvmf.py b/scripts/perf/nvmf/run_nvmf.py index d5d714b12..4ec1207a0 100755 --- a/scripts/perf/nvmf/run_nvmf.py +++ b/scripts/perf/nvmf/run_nvmf.py @@ -602,8 +602,11 @@ class SPDKTarget(Target): req_num_disks = get_nvme_devices_count() # Distribute bdevs between provided NICs - num_disks = range(1, req_num_disks + 1) - disks_per_ip = int(len(num_disks) / len(ips)) + num_disks = range(0, req_num_disks) + if len(num_disks) == 1: + disks_per_ip = 1 + else: + disks_per_ip = int(len(num_disks) / len(ips)) disk_chunks = [num_disks[i * disks_per_ip:disks_per_ip + disks_per_ip * i] for i in range(0, len(ips))] # Create subsystems, add bdevs to namespaces, add listeners @@ -611,7 +614,7 @@ class SPDKTarget(Target): for c in chunk: nqn = "nqn.2018-09.io.spdk:cnode%s" % c serial = "SPDK00%s" % c - bdev_name = "Nvme%sn1" % (c - 1) + bdev_name = "Nvme%sn1" % c rpc.nvmf.nvmf_create_subsystem(self.client, nqn, serial, allow_any_host=True, max_namespaces=8) rpc.nvmf.nvmf_subsystem_add_ns(self.client, nqn, bdev_name) @@ -696,8 +699,8 @@ class KernelInitiator(Initiator): filename_section = "" filenames = ["nvme%sn1" % x for x in range(0, len(nvme_list))] - nvme_per_split = int(len(nvme_list) / threads) - remainder = len(nvme_list) % threads + nvme_per_split = int(len(nvme_list) / len(threads)) + remainder = len(nvme_list) % len(threads) iterator = iter(filenames) result = [] for i in range(len(threads)):