public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Mira Limbeck <m.limbeck@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH v2 storage 09/15] iscsi: remove stale sessions in non-mapping case
Date: Thu, 30 Apr 2026 19:27:07 +0200	[thread overview]
Message-ID: <20260430173220.441001-10-m.limbeck@proxmox.com> (raw)
In-Reply-To: <20260430173220.441001-1-m.limbeck@proxmox.com>

So far there was no cleanup for sessions of target/portal combinations
that are no longer exported.
Adds a cleanup after all logins are done or sessions are rescanned.

Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
---
This patch is optional and may be a bit controversial since it changes
the current behavior.

This patch should be discussed in-depth before it is applied.

 src/PVE/Storage/ISCSIPlugin.pm | 35 ++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/PVE/Storage/ISCSIPlugin.pm b/src/PVE/Storage/ISCSIPlugin.pm
index b3f4e60..5b636a8 100644
--- a/src/PVE/Storage/ISCSIPlugin.pm
+++ b/src/PVE/Storage/ISCSIPlugin.pm
@@ -736,6 +736,41 @@ sub activate_storage {
             iscsi_session_rescan($targets->{$target}->{sessions});
         }
     }
+
+    # log out of stale sessions
+    # should only be needed for the non-mapping case
+    if (!$local_cfg->{is_mapping}) {
+        for my $target (keys $targets->%*) {
+            for my $session ($targets->{$target}->{sessions}->@*) {
+                my $portals = $targets->{$target}->{portals};
+                if (!grep(/^\Q$session->{portal}\E$/, $portals->@*)) {
+                    my $sid = $session->{session_id};
+                    my $portal = $session->{portal};
+                    print "logging out of stale iscsi session: $sid for $target via $portal\n";
+                    my $cmd = [
+                        $ISCSIADM, '--mode', 'session', '--sid', $sid, '--logout',
+                    ];
+                    eval { run_command($cmd); };
+                    warn "failed to log out of stale session: $@\n" if $@;
+
+                    print "removing stale node entry: $target via $portal\n";
+                    $cmd = [
+                        $ISCSIADM,
+                        '--mode',
+                        'node',
+                        '--target',
+                        $target,
+                        '--portal',
+                        $portal,
+                        '-o',
+                        'delete',
+                    ];
+                    eval { run_command($cmd); };
+                    warn "failed to remove stale node entry: $@\n" if $@;
+                }
+            }
+        }
+    }
 }
 
 sub deactivate_storage {
-- 
2.47.3




  parent reply	other threads:[~2026-04-30 17:33 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-04-30 17:26 [PATCH v2 cluster/storage/manager 00/15] storage mapping Mira Limbeck
2026-04-30 17:26 ` [PATCH v2 cluster 01/15] mapping: add storage.cfg Mira Limbeck
2026-04-30 17:27 ` [PATCH v2 storage 02/15] mapping: add base plugin Mira Limbeck
2026-04-30 17:35   ` Mira Limbeck
2026-04-30 17:27 ` [PATCH v2 storage 03/15] mapping: add iSCSI plugin Mira Limbeck
2026-04-30 17:27 ` [PATCH v2 storage 04/15] iscsi: introduce mapping support Mira Limbeck
2026-04-30 17:27 ` [PATCH v2 storage 05/15] iscsi: add helper to get local config Mira Limbeck
2026-04-30 17:27 ` [PATCH v2 storage 06/15] iscsi: change functions to handle mappings Mira Limbeck
2026-04-30 17:27 ` [PATCH v2 storage 07/15] iscsi: introduce helper to update discovery db Mira Limbeck
2026-04-30 17:27 ` [PATCH v2 storage 08/15] iscsi: rework to update discovery db and simplify login Mira Limbeck
2026-04-30 17:27 ` Mira Limbeck [this message]
2026-04-30 17:27 ` [PATCH v2 storage 10/15] api: add mapping support Mira Limbeck
2026-04-30 17:27 ` [PATCH v2 storage 11/15] mapping: iscsi: add discovery-portal config option Mira Limbeck
2026-04-30 17:27 ` [PATCH v2 storage 12/15] iscsi: add support for non-persistent discovery Mira Limbeck
2026-04-30 17:38   ` Mira Limbeck
2026-04-30 17:27 ` [PATCH v2 storage 13/15] api: add non-persistent iscsi discovery option Mira Limbeck
2026-04-30 17:27 ` [POC v2 storage 14/15] mapping: add zfspool plugin Mira Limbeck
2026-04-30 17:27 ` [PATCH v2 manager 15/15] api: mapping: add storage mapping path Mira Limbeck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260430173220.441001-10-m.limbeck@proxmox.com \
    --to=m.limbeck@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal