From bf642c08a45b9ca7c43d57ac3c696af0b6357eac Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Fri, 20 May 2022 10:27:06 +0200 Subject: [PATCH] scripts/nvmf_perf: add explicit listener for discovery subsystem As introduced in 25bc221ceeaa11efcd95d2f65f4bb8a03ee4eaa2: listeners for created subsystems should also be added to discovery subsystem. Signed-off-by: Karol Latecki Change-Id: Id37854ea9a7877eb3e4eb37675d6918ef2931e7e Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12676 Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Tomasz Zawadzki Reviewed-by: Konrad Sztyber --- scripts/perf/nvmf/run_nvmf.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/perf/nvmf/run_nvmf.py b/scripts/perf/nvmf/run_nvmf.py index 02d1c63f5..0bb6e07c2 100755 --- a/scripts/perf/nvmf/run_nvmf.py +++ b/scripts/perf/nvmf/run_nvmf.py @@ -836,6 +836,7 @@ class Initiator(Server): r'traddr:\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})', # get IP address nvme_discover_output) # from nvme discovery output subsystems = filter(lambda x: x[-1] in address_list, subsystems) + subsystems = filter(lambda x: "discovery" not in x[1], subsystems) subsystems = list(set(subsystems)) subsystems.sort(key=lambda x: x[1]) self.log_print("Found matching subsystems on target side:") @@ -1190,12 +1191,13 @@ class SPDKTarget(Target): 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) - rpc.nvmf.nvmf_subsystem_add_listener(self.client, - nqn=nqn, - trtype=self.transport, - traddr=ip, - trsvcid=port, - adrfam="ipv4") + for nqn_name in [nqn, "discovery"]: + rpc.nvmf.nvmf_subsystem_add_listener(self.client, + nqn=nqn_name, + trtype=self.transport, + traddr=ip, + trsvcid=port, + adrfam="ipv4") self.subsystem_info_list.append([port, nqn, ip]) self.subsys_no = len(self.subsystem_info_list)