From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id DFD3A1FF13C for ; Thu, 30 Apr 2026 19:39:04 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BAEDE16A8F; Thu, 30 Apr 2026 19:39:04 +0200 (CEST) Message-ID: Date: Thu, 30 Apr 2026 19:38:30 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 storage 12/15] iscsi: add support for non-persistent discovery To: pve-devel@lists.proxmox.com References: <20260430173220.441001-1-m.limbeck@proxmox.com> <20260430173220.441001-13-m.limbeck@proxmox.com> Content-Language: en-US From: Mira Limbeck In-Reply-To: <20260430173220.441001-13-m.limbeck@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1777570611835 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.355 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: 5HBHNMZEEHBB6RCIFQW7R3YCSXAX6IW6 X-Message-ID-Hash: 5HBHNMZEEHBB6RCIFQW7R3YCSXAX6IW6 X-MailFrom: m.limbeck@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: On 4/30/26 7:31 PM, Mira Limbeck wrote: > When running a discovery to gather all targets and portals to configure > mappings it is not necessary to modify the discovery db. > > For multiple discovery portals it is also important to not stop early > when a previous portal already returned targets and portals. > > Signed-off-by: Mira Limbeck > --- > > src/PVE/Storage/ISCSIPlugin.pm | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/src/PVE/Storage/ISCSIPlugin.pm b/src/PVE/Storage/ISCSIPlugin.pm > index 5b636a8..a95edf4 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) = @_; > + my ($target_in, $portals, $cache, $update_db) = @_; > > assert_iscsi_support(); > > @@ -209,6 +209,7 @@ sub iscsi_discovery { > next if !iscsi_test_portal($target_in, $portal, $cache); # fixme: raise exception here? > > my $cmd = [$ISCSIADM, '--mode', 'discovery', '--type', 'sendtargets', '--portal', $portal]; > + push $cmd->@*, '-o', 'nonpersistent' if !$update_db; > eval { > run_command( > $cmd, > @@ -226,7 +227,7 @@ sub iscsi_discovery { > }; > > # In case of multipath we can stop after receiving targets from any available portal > - last if scalar(keys %$res) > 0; > + last if defined($target) && scalar(keys %$res) > 0; > } > > return $res; This is missing a change to the iscsi_discovery call in update_iscsi_discovery_db. There the iscsi_discovery call needs to be changed to: my $res = eval { iscsi_discovery($target, $portals, $cache, 1); }; adding the `1` at the end to make sure the discovery db is updated in that case. I'll fix that in a v3 next week.