[PATCH storage 6/7] iscsi: iscsi_portals: return empty list instead of fallback portal

[Dietmar Maurer <dietmar@proxmox.com>]

Returning the configured discovery address when the node db has no
records (or iscsiadm fails) hides whether records exist from callers.
Move the fallback to the call sites, so an upcoming change can gate
sendtargets discovery on the node db being empty.

No functional change.

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

diff --git a/src/PVE/Storage/ISCSIPlugin.pm b/src/PVE/Storage/ISCSIPlugin.pm
index 585b8c2..85f33aa 100644
--- a/src/PVE/Storage/ISCSIPlugin.pm
+++ b/src/PVE/Storage/ISCSIPlugin.pm
@@ -94,7 +94,7 @@ sub iscsi_test_portal {
 }
 
 sub iscsi_portals {
-    my ($target, $portal_in) = @_;
+    my ($target) = @_;
 
     assert_iscsi_support();
 
@@ -115,15 +115,12 @@ sub iscsi_portals {
             },
         );
     };
-
-    my $err = $@;
-    warn $err if $err;
-
-    if ($err || !scalar(@$res)) {
-        return [$portal_in];
-    } else {
-        return $res;
+    if (my $err = $@) {
+        warn $err;
+        return [];
     }
+
+    return $res;
 }
 
 # normalize for comparison: iscsiadm reports portals with an explicit port
@@ -726,7 +723,9 @@ sub activate_storage {
         if ($static) {
             iscsi_sync_node_records($target, $portals, $cache);
         } else {
-            $portals = iscsi_portals($target, $portals->[0]);
+            # fall back to the configured discovery address on an empty node db
+            my $recorded = iscsi_portals($target);
+            $portals = $recorded if scalar(@$recorded);
         }
 
         my $sessions = iscsi_session($cache, $target);
@@ -877,7 +876,11 @@ sub check_connection {
     my $node_targets = get_node_targets($scfg);
     for my $node_target (@{ $node_targets->{targets} }) {
         my ($target, $portals) = ($node_target->{target}, $node_target->{portals});
-        $portals = iscsi_portals($target, $portals->[0]) if !$node_targets->{static};
+        if (!$node_targets->{static}) {
+            # fall back to the configured discovery address on an empty node db
+            my $recorded = iscsi_portals($target);
+            $portals = $recorded if scalar(@$recorded);
+        }
 
         for my $portal (@$portals) {
             my $result = iscsi_test_portal($target, $portal, $cache);
-- 
2.47.3