From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 3EFBF1FF13C for ; Thu, 30 Apr 2026 19:33:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2B72915C31; Thu, 30 Apr 2026 19:32:48 +0200 (CEST) From: Mira Limbeck To: pve-devel@lists.proxmox.com Subject: [PATCH v2 storage 13/15] api: add non-persistent iscsi discovery option Date: Thu, 30 Apr 2026 19:27:11 +0200 Message-ID: <20260430173220.441001-14-m.limbeck@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260430173220.441001-1-m.limbeck@proxmox.com> References: <20260430173220.441001-1-m.limbeck@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.555 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Message-ID-Hash: CV5CQ2TZ73JC6RR5JFIDD7Y54IVVKAUT X-Message-ID-Hash: CV5CQ2TZ73JC6RR5JFIDD7Y54IVVKAUT X-MailFrom: mira@nena.proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: and return new portals list with reachability information for each portal Signed-off-by: Mira Limbeck --- src/PVE/API2/Storage/Scan.pm | 32 ++++++++++++++++++++++++++++++-- src/PVE/CLI/pvesm.pm | 3 ++- src/PVE/Storage.pm | 2 +- src/PVE/Storage/ISCSIPlugin.pm | 15 +++++++++++---- 4 files changed, 44 insertions(+), 8 deletions(-) diff --git a/src/PVE/API2/Storage/Scan.pm b/src/PVE/API2/Storage/Scan.pm index a58bdd8..f272e3b 100644 --- a/src/PVE/API2/Storage/Scan.pm +++ b/src/PVE/API2/Storage/Scan.pm @@ -265,6 +265,12 @@ __PACKAGE__->register_method({ type => 'string', format => 'pve-storage-portal-dns', }, + persist => { + description => 'Persist discovery results to discovery db.', + type => 'boolean', + optional => 1, + default => 1, + }, }, }, returns => { @@ -280,17 +286,39 @@ __PACKAGE__->register_method({ description => "The iSCSI portal name.", type => 'string', }, + portals => { + description => 'The iSCSI portals discovered, includes reachability.', + type => 'string', + }, }, }, }, code => sub { my ($param) = @_; - my $res = PVE::Storage::scan_iscsi($param->{portal}); + my $persist = $param->{persist} // 1; + my $res = PVE::Storage::scan_iscsi($param->{portal}, $persist); my $data = []; foreach my $k (sort keys %$res) { - push @$data, { target => $k, portal => join(',', @{ $res->{$k} }) }; + my $portals = []; + my $portals_reachability = []; + for my $entry ($res->{$k}->@*) { + my $portal = $entry->{portal}; + my $reachability = $entry->{reachable} ? '1' : '0'; + push $portals->@*, $portal; + push $portals_reachability->@*, $portal . ':' . $reachability; + } + #my $portals = [ map { $_->{portal} } $res->{$k}->@* ]; + #my $portals_reachability = [ map { $_->{portal} . ':' . ($_->{reachable} ? '1' : '0') } $res->{$k}->@* ]; + my $entry = { + target => $k, + portal => join(',', $portals->@*), + portals => join(',', $portals_reachability->@*), + #portals => join(',', map { $_->{portal}.':'.($_->{reachable} // '0') } $res->{$k}->@*), + }; + #push @$data, { target => $k, portal => join(',', $portals->@*) }; + push $data->@*, $entry; } return $data; diff --git a/src/PVE/CLI/pvesm.pm b/src/PVE/CLI/pvesm.pm index 06bc4c9..6e88123 100755 --- a/src/PVE/CLI/pvesm.pm +++ b/src/PVE/CLI/pvesm.pm @@ -688,7 +688,8 @@ our $cmddef = { $maxlen = $len if $len > $maxlen; } foreach my $rec (@$res) { - printf "%-${maxlen}s %s\n", $rec->{target}, $rec->{portal}; + printf "%-${maxlen}s %s %s\n", $rec->{target}, $rec->{portal}, + $rec->{portals}; } }, ], diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm index d783788..73546d2 100755 --- a/src/PVE/Storage.pm +++ b/src/PVE/Storage.pm @@ -1658,7 +1658,7 @@ sub scan_iscsi { die "unable to parse/resolve portal address '${portal_in}'\n"; } - return PVE::Storage::ISCSIPlugin::iscsi_discovery(undef, [$portal]); + return PVE::Storage::ISCSIPlugin::iscsi_discovery(undef, [$portal], undef, 0); } sub storage_default_format { diff --git a/src/PVE/Storage/ISCSIPlugin.pm b/src/PVE/Storage/ISCSIPlugin.pm index a95edf4..066d1ed 100644 --- a/src/PVE/Storage/ISCSIPlugin.pm +++ b/src/PVE/Storage/ISCSIPlugin.pm @@ -200,7 +200,7 @@ sub iscsi_portals { } sub iscsi_discovery { - my ($target_in, $portals, $cache, $update_db) = @_; + my ($target_in, $portals, $cache, $persist) = @_; assert_iscsi_support(); @@ -208,8 +208,9 @@ sub iscsi_discovery { for my $portal ($portals->@*) { next if !iscsi_test_portal($target_in, $portal, $cache); # fixme: raise exception here? + my $target_found = 0; my $cmd = [$ISCSIADM, '--mode', 'discovery', '--type', 'sendtargets', '--portal', $portal]; - push $cmd->@*, '-o', 'nonpersistent' if !$update_db; + push $cmd->@*, '-o', 'nonpersistent' if !$persist; eval { run_command( $cmd, @@ -220,14 +221,20 @@ sub iscsi_discovery { my ($portal, $target) = ($1, $2); # one target can have more than one portal (multipath) # and sendtargets should return all of them in single call - push @{ $res->{$target} }, $portal; + my $entry = { + portal => $portal, + reachable => !!iscsi_test_portal($target, $portal, $cache), + }; + push @{ $res->{$target} }, $entry; + + $target_found = 1 if defined($target_in) && $target_in eq $target; } }, ); }; # In case of multipath we can stop after receiving targets from any available portal - last if defined($target) && scalar(keys %$res) > 0; + last if $target_found && scalar(keys %$res) > 0; } return $res; -- 2.47.3