public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH v8 storage 21/43] api: scan: name the portal of an iSCSI path
Date: Thu, 19 Nov 2026 20:46:26 +0100	[thread overview]
Message-ID: <20261119194655.3163258-22-t.lamprecht@proxmox.com> (raw)
In-Reply-To: <20261119194655.3163258-1-t.lamprecht@proxmox.com>

The paths of an iSCSI LUN differ by the portal of their session, which
the node reads for its iSCSI status now. Report it as the address of a
path in the LUN inventory, as for an NVMe path, so that a failed path
of a LUN, with or without a map, names the portal to check.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 src/PVE/API2/Storage/Scan.pm       |  3 ++-
 src/PVE/ISCSI/Topology.pm          |  1 +
 src/PVE/Storage/SAN.pm             |  7 +++++++
 src/test/run_san_lun_scan_tests.pl | 19 ++++++++++++++++---
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/PVE/API2/Storage/Scan.pm b/src/PVE/API2/Storage/Scan.pm
index f3e2dc1e..343b073a 100644
--- a/src/PVE/API2/Storage/Scan.pm
+++ b/src/PVE/API2/Storage/Scan.pm
@@ -501,7 +501,8 @@ __PACKAGE__->register_method({
                             },
                             address => {
                                 description => "The address of the NVMe controller the"
-                                    . " path uses.",
+                                    . " path uses, or the portal of the iSCSI session of the"
+                                    . " path.",
                                 type => 'string',
                                 optional => 1,
                             },
diff --git a/src/PVE/ISCSI/Topology.pm b/src/PVE/ISCSI/Topology.pm
index f975f94f..897bc5a8 100644
--- a/src/PVE/ISCSI/Topology.pm
+++ b/src/PVE/ISCSI/Topology.pm
@@ -55,6 +55,7 @@ sub sessions($sysfs = undef) {
                     return if !defined($dev);
                     $session->{devices}->{$dev} = {
                         target => $target,
+                        portal => $session->{portal},
                         session => int($sid),
                         channel => int($channel),
                         id => int($id),
diff --git a/src/PVE/Storage/SAN.pm b/src/PVE/Storage/SAN.pm
index 00c45717..82fb0e44 100644
--- a/src/PVE/Storage/SAN.pm
+++ b/src/PVE/Storage/SAN.pm
@@ -170,6 +170,13 @@ sub scan_luns($cfg) {
         $row->{'paths-total'} = scalar(@paths);
         $row->{'paths-active'} = scalar(grep { $_->{state} eq 'running' } @paths);
     }
+    # the portal of its session tells an iSCSI path apart, as the address does for NVMe
+    for my $row (values %rows) {
+        for my $path (($row->{'path-list'} // [])->@*) {
+            my $portal = ($sessions->{ basename($path->{device}) } // {})->{portal};
+            $path->{address} //= $portal if length($portal // '');
+        }
+    }
     for my $row (values %rows) {
         # the devices of a LUN whose requested map is missing do not tell the state of the LUN
         if (defined($row->{'paths-active'}) && $row->{multipath} ne 'pending') {
diff --git a/src/test/run_san_lun_scan_tests.pl b/src/test/run_san_lun_scan_tests.pl
index d394bc0b..8ee76a49 100755
--- a/src/test/run_san_lun_scan_tests.pl
+++ b/src/test/run_san_lun_scan_tests.pl
@@ -47,7 +47,8 @@ my $generator = Test::MockModule->new('PVE::Multipath::Generator');
 $generator->mock(derived_wwids => sub { {} });
 $iscsi->mock(
     device_map => sub {
-        return { map { $_ => { target => 'iqn.test', lun => 1 } } qw(sdb sdc) };
+        return { map { $_ => { target => 'iqn.test', lun => 1, portal => '192.0.2.10:3260' } }
+            qw(sdb sdc) };
     },
 );
 my @listed;
@@ -119,10 +120,14 @@ is($row{'3600plain'}->{'used-by-storage'}, 'direct', 'a storage serving the LUNs
 }
 is_deeply(
     $row{'3600plain'}->{'path-list'},
-    [map { { device => $_, state => 'running' } } qw(/dev/sdb /dev/sdc)],
-    'without a map, the devices of a LUN are its paths',
+    [
+        map { { device => $_, state => 'running', address => '192.0.2.10:3260' } }
+            qw(/dev/sdb /dev/sdc)
+    ],
+    'without a map, the devices of a LUN are its paths, with the portal of their session',
 );
 is($row{'3600plain'}->{state}, 'optimal', 'their kernel state gives the health of the LUN');
+ok(!exists($row{'3600map'}->{'path-list'}->[0]->{address}), 'no portal without a session');
 {
     local $device_state{sdc} = 'transport-offline';
     my ($down) = grep { $_->{wwid} eq '3600plain' } PVE::Storage::SAN::scan_luns($cfg)->@*;
@@ -142,6 +147,14 @@ is($row{'3600plain'}->{state}, 'optimal', 'their kernel state gives the health o
     ok(!exists($pending->{state}), 'but has no state from them');
     $mp->mock(list_etc_multipath_wwids => sub { [] });
 }
+{
+    # an iSCSI path of a map
+    my $sessions = PVE::ISCSI::Topology::device_map();
+    $iscsi->mock(device_map => sub { +{ %$sessions, sdd => { %{ $sessions->{sdb} } } } });
+    my ($map) = grep { $_->{wwid} eq '3600map' } PVE::Storage::SAN::scan_luns($cfg)->@*;
+    is($map->{'path-list'}->[0]->{address}, '192.0.2.10:3260', 'names the portal of its session');
+    $iscsi->mock(device_map => sub { $sessions });
+}
 {
     # a LUN with a single path and no map
     $id->mock(path_wwid => sub { $_[1] eq 'sdb' ? '3600plain' : undef });




  parent reply	other threads:[~2026-11-19 19:50 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-19 19:46 [PATCH v8 cluster,storage,docs,manager 00/43] SAN: cluster-wide multipath, SAN views and a guided setup for shared LVM Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 cluster 01/43] cfs: observe the multipath configuration files Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 02/43] diskmanage: collect disk transport type from lsblk Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 03/43] diskmanage: qualify NVMe over Fabrics transport Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 04/43] diskmanage: optionally include iSCSI session devices in disk enumeration Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 05/43] diskmanage: collect native NVMe multipath path state Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 06/43] iscsi: factor out session device map from device list Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 07/43] multipath: add a library around multipathd Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 08/43] diskmanage: add helper to list multipath devices Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 09/43] multipath: add a cluster-wide configuration Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 10/43] iscsi: add an option to manage storage LUNs with multipath Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 11/43] lvm: activate a missing base volume before using the volume group Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 12/43] multipath: apply the configuration on every node Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 13/43] multipath: publish per-node status Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 14/43] api: add endpoints for the cluster-wide multipath configuration Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 15/43] api: multipath: add the cluster-wide health status Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 16/43] diskmanage: look up the requested disks by name Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 17/43] diskmanage: read the udev data of all disks with one call Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 18/43] api: scan: add a SAN LUN inventory Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 19/43] pvesm: expose the " Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 20/43] api: add node-level iSCSI status Thomas Lamprecht
2026-11-19 19:46 ` Thomas Lamprecht [this message]
2026-11-19 19:46 ` [PATCH v8 storage 22/43] disks: lvm: drop unused imports Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 23/43] disks: lvm: allow volume groups on SAN LUNs and multipath maps Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 24/43] disks: lvm: refuse to destroy the volume group of a shared storage Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 25/43] disks: allow wiping a SAN LUN that no storage uses Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 storage 26/43] api: scan: report the process that has a SAN LUN open Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 docs 27/43] storage: document the cluster-wide multipath management Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 docs 28/43] storage: multipath: describe the use shown for an open LUN Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 manager 29/43] pvestatd: apply the multipath configuration and report the node status Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 manager 30/43] report: add the managed multipath configuration Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 manager 31/43] api: cluster: add the multipath endpoints Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 manager 32/43] api: nodes: expose the iSCSI status Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 manager 33/43] ui: dc: add a SAN view Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 manager 34/43] ui: storage: iscsi: add the multipath option Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 manager 35/43] ui: lvm: enable shared when a base storage is selected Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 manager 36/43] ui: node: add SAN LUNs panel Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 manager 37/43] ui: node: san: wipe a LUN that no storage uses Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 manager 38/43] ui: node: san: show iSCSI targets and sessions Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 manager 39/43] ui: dc: san: add a guided setup for shared LVM on iSCSI Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 manager 40/43] ui: dc: san: add a guided setup for shared LVM on Fibre Channel Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 manager 41/43] ui: storage: point the iSCSI and LVM add dialogs to the SAN view Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 manager 42/43] ui: san: show the guest or process that has a LUN open Thomas Lamprecht
2026-11-19 19:46 ` [PATCH v8 manager 43/43] ui: node: san: add a column for the target or subsystem of a LUN Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261119194655.3163258-22-t.lamprecht@proxmox.com \
    --to=t.lamprecht@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal