--- Begin Message ---
don't check tcp connection directly if there are already
sessions. Use iscsiadm command to check the sessions
status instead.
pvestatd is calling check_connection every 10 seconds.
This check produces a lot of noise at the iscsi server logging.
Signed-off-by: Victor Seva <linuxman...@torreviejawireless.org>
---
src/PVE/Storage/ISCSIPlugin.pm | 34 +++++++++++++++++++++++++++++++---
1 file changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/PVE/Storage/ISCSIPlugin.pm b/src/PVE/Storage/ISCSIPlugin.pm
index eb70453..89fc871 100644
--- a/src/PVE/Storage/ISCSIPlugin.pm
+++ b/src/PVE/Storage/ISCSIPlugin.pm
@@ -66,6 +66,23 @@ sub iscsi_test_portal {
return PVE::Network::tcp_ping($server, $port || 3260, 2);
}
+sub iscsi_test_session {
+ my ($sid) = @_;
+ my $cmd = [$ISCSIADM, '--mode', 'session', '--sid', $sid, '-P1'];
+
+ my $res = 0;
+ eval {
+ run_command($cmd, errmsg => 'iscsi session test failed', outfunc =>
sub {
+ my $line = shift;
+ if ($line =~ m/^\s+iSCSI Session State: LOGGED_IN\s*$/) {
+ $res = 1;
+ }
+ });
+ };
+ die "session check failed: $@\n" if $@;
+ return $res;
+}
+
sub iscsi_portals {
my ($target, $portal_in) = @_;
@@ -560,11 +577,22 @@ sub activate_volume {
sub check_connection {
my ($class, $storeid, $scfg) = @_;
+ my $cache = {};
+ my $sessions = iscsi_session($cache, $scfg->{target});
my $portals = iscsi_portals($scfg->{target}, $scfg->{portal});
- for my $portal (@$portals) {
- my $result = iscsi_test_portal($portal);
- return $result if $result;
+ for my $portal ($portals->@*) {
+ my $session_exists = 0;
+ for my $session ($sessions->@*) {
+ next if $session->{portal} ne $portal;
+ $session_exists = 1;
+ my $result = iscsi_test_session($session->{session_id});
+ return $result if $result;
+ }
+ next if $session_exists;
+ # no sessions, check portal via tcp
+ my $result = iscsi_test_portal($portal);
+ return $result if $result;
}
return 0;
--
2.43.0
--- End Message ---
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
