[PATCH storage 2/7] iscsi: scan: do not persist discovery results in the node database

[Dietmar Maurer <dietmar@proxmox.com>]

Scanning a portal is an inspection operation, but sendtargets discovery
writes a node db record for every target the portal advertises. So
filling the target dropdown in the storage wizard, or an abandoned
wizard run, leaves the scanning node with records for targets nobody
configured, and makes it diverge from its peers.

Ask iscsiadm to leave the node db alone for scans. Discovery on the
login path keeps persisting, since logging in works off those records.

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
---
 src/PVE/Storage.pm             | 2 +-
 src/PVE/Storage/ISCSIPlugin.pm | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm
index 64ea9da..81df50f 100755
--- a/src/PVE/Storage.pm
+++ b/src/PVE/Storage.pm
@@ -1655,7 +1655,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, 1);
 }
 
 sub storage_default_format {
diff --git a/src/PVE/Storage/ISCSIPlugin.pm b/src/PVE/Storage/ISCSIPlugin.pm
index 807adbd..9944806 100644
--- a/src/PVE/Storage/ISCSIPlugin.pm
+++ b/src/PVE/Storage/ISCSIPlugin.pm
@@ -125,8 +125,11 @@ sub iscsi_portals {
     }
 }
 
+# Discovery persists a node db record for every returned target unless
+# $nonpersistent is set. Callers that only inspect a portal should set it,
+# callers that log in afterwards rely on the records.
 sub iscsi_discovery {
-    my ($target_in, $portals, $cache) = @_;
+    my ($target_in, $portals, $cache, $nonpersistent) = @_;
 
     assert_iscsi_support();
 
@@ -136,6 +139,7 @@ sub iscsi_discovery {
 
         my $target_found = 0;
         my $cmd = [$ISCSIADM, '--mode', 'discovery', '--type', 'sendtargets', '--portal', $portal];
+        push @$cmd, '--op', 'nonpersistent' if $nonpersistent;
         eval {
             run_command(
                 $cmd,
-- 
2.47.3