[PATCH storage 1/7] iscsi: discovery: do not stop early on a foreign target

[Dietmar Maurer <dietmar@proxmox.com>]

sendtargets returns every portal of a target in one call, so querying
further portals is pointless once the requested target showed up. The
check only looked at whether any target came back, so a portal that
serves other targets aborted the loop before the portals that actually
serve the requested one were queried.

Discovery without a requested target now queries all given portals,
which is what a caller enumerating a SAN wants.

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

diff --git a/src/PVE/Storage/ISCSIPlugin.pm b/src/PVE/Storage/ISCSIPlugin.pm
index 801b5d1..807adbd 100644
--- a/src/PVE/Storage/ISCSIPlugin.pm
+++ b/src/PVE/Storage/ISCSIPlugin.pm
@@ -134,6 +134,7 @@ 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];
         eval {
             run_command(
@@ -146,13 +147,16 @@ sub iscsi_discovery {
                         # one target can have more than one portal (multipath)
                         # and sendtargets should return all of them in single call
                         push @{ $res->{$target} }, $portal;
+
+                        $target_found = 1 if defined($target_in) && $target eq $target_in;
                     }
                 },
             );
         };
 
-        # In case of multipath we can stop after receiving targets from any available portal
-        last if scalar(keys %$res) > 0;
+        # sendtargets returns all portals of a target, so one hit is enough. Without a
+        # requested target, query every portal to get the full picture
+        last if $target_found;
     }
 
     return $res;
-- 
2.47.3