[PATCH v2 storage 12/15] iscsi: add support for non-persistent discovery

[Mira Limbeck <m.limbeck@proxmox.com>]

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 <m.limbeck@proxmox.com>
---

 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;
-- 
2.47.3