From 9cf27937df2f9fc0f994429d4b09aaeb0e235686 Mon Sep 17 00:00:00 2001 From: Maciej Wawryk Date: Fri, 14 Jan 2022 13:00:03 +0100 Subject: [PATCH] scripts/nvmf: Distribute all disk between all NICs Signed-off-by: Maciej Wawryk Change-Id: I72fc8cb42f57d3272a08a6cefc58b2fa5eb26419 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11094 Reviewed-by: Konrad Sztyber Reviewed-by: Karol Latecki Reviewed-by: Tomasz Zawadzki Tested-by: SPDK CI Jenkins Community-CI: Broadcom CI --- scripts/perf/nvmf/run_nvmf.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/perf/nvmf/run_nvmf.py b/scripts/perf/nvmf/run_nvmf.py index c75f20195..60eb5020b 100755 --- a/scripts/perf/nvmf/run_nvmf.py +++ b/scripts/perf/nvmf/run_nvmf.py @@ -969,6 +969,10 @@ class KernelTarget(Target): disks_per_ip = int(len(nvme_list) / len(address_list)) disk_chunks = [nvme_list[i * disks_per_ip:disks_per_ip + disks_per_ip * i] for i in range(0, len(address_list))] + # Add remaining drives + for i, disk in enumerate(nvme_list[disks_per_ip * len(address_list):]): + disks_chunks[i].append(disk) + subsys_no = 1 port_no = 0 for ip, chunk in zip(address_list, disk_chunks): @@ -1143,7 +1147,11 @@ class SPDKTarget(Target): 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))] + disk_chunks = [[*num_disks[i * disks_per_ip:disks_per_ip + disks_per_ip * i]] for i in range(0, len(ips))] + + # Add remaining drives + for i, disk in enumerate(num_disks[disks_per_ip * len(ips):]): + disk_chunks[i].append(disk) # Create subsystems, add bdevs to namespaces, add listeners for ip, chunk in zip(ips, disk_chunks):