yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #957: iscsi: improve iscsi_test_portal logic

Browse Source 
Check if there is already a logged session present and fall back to
previous TCP check port connection.

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 <linuxmaniac@torreviejawireless.org>
Tested-by: Mira Limbeck <m.limbeck@proxmox.com>
Reviewed-by: Mira Limbeck <m.limbeck@proxmox.com>
Tested-by: Friedrich Weber <f.weber@proxmox.com>
Reviewed-by: Friedrich Weber <f.weber@proxmox.com>
This commit is contained in:
Victor Seva
2025-03-20 15:23:20 +01:00
committed by Thomas Lamprecht
parent 9dd136c8df
commit 32e482a617
2 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/PVE/Storage.pm
View File

@ -1479,7 +1479,7 @@ sub scan_iscsi {
die "unable to parse/resolve portal address '${portal_in}'\n"; die "unable to parse/resolve portal address '${portal_in}'\n";
} }
return PVE::Storage::ISCSIPlugin::iscsi_discovery([ $portal ]); return PVE::Storage::ISCSIPlugin::iscsi_discovery(undef, [ $portal ]);
} }
sub storage_default_format { sub storage_default_format {

39
src/PVE/Storage/ISCSIPlugin.pm
View File

@ -58,9 +58,30 @@ sub iscsi_session_list {
return $res; return $res;
} }
sub iscsi_test_portal { sub iscsi_test_session {
my ($portal) = @_; my ($sid) = @_;
if ($sid !~ m/^[0-9]+$/) {
die "session_id: '$sid' is not a number\n";
}
my $state = file_read_firstline("/sys/class/iscsi_session/session${sid}/state");
return defined($state) && $state eq 'LOGGED_IN';
}
sub iscsi_test_portal {
my ($target, $portal, $cache) = @_;
$cache //= {};
if (defined($target)) {
# check session state instead if available
my $sessions = iscsi_session($cache, $target);
for my $session ($sessions->@*) {
next if $session->{portal} ne $portal;
my $state = iscsi_test_session($session->{session_id});
return $state if $state;
}
}
# check portal via tcp
my ($server, $port) = PVE::Tools::parse_host_and_port($portal); my ($server, $port) = PVE::Tools::parse_host_and_port($portal);
return 0 if !$server; return 0 if !$server;
return PVE::Network::tcp_ping($server, $port || 3260, 2); return PVE::Network::tcp_ping($server, $port || 3260, 2);
@ -97,13 +118,13 @@ sub iscsi_portals {
} }
sub iscsi_discovery { sub iscsi_discovery {
my ($portals) = @_; my ($target_in, $portals, $cache) = @_;
assert_iscsi_support(); assert_iscsi_support();
my $res = {}; my $res = {};
for my $portal ($portals->@*) { for my $portal ($portals->@*) {
next if !iscsi_test_portal($portal); # fixme: raise exception here? next if !iscsi_test_portal($target_in, $portal, $cache); # fixme: raise exception here?
my $cmd = [$ISCSIADM, '--mode', 'discovery', '--type', 'sendtargets', '--portal', $portal]; my $cmd = [$ISCSIADM, '--mode', 'discovery', '--type', 'sendtargets', '--portal', $portal];
eval { eval {
@ -127,11 +148,11 @@ sub iscsi_discovery {
} }
sub iscsi_login { sub iscsi_login {
my ($target, $portals) = @_; my ($target, $portals, $cache) = @_;
assert_iscsi_support(); assert_iscsi_support();
eval { iscsi_discovery($portals); }; eval { iscsi_discovery($target, $portals, $cache); };
warn $@ if $@; warn $@ if $@;
# Disable retries to avoid blocking pvestatd for too long, next iteration will retry anyway # Disable retries to avoid blocking pvestatd for too long, next iteration will retry anyway
@ -445,7 +466,7 @@ sub activate_storage {
} }
if ($do_login) { if ($do_login) {
eval { iscsi_login($scfg->{target}, $portals); }; eval { iscsi_login($scfg->{target}, $portals, $cache); };
warn $@ if $@; warn $@ if $@;
} else { } else {
# make sure we get all devices # make sure we get all devices
@ -559,11 +580,11 @@ sub activate_volume {
sub check_connection { sub check_connection {
my ($class, $storeid, $scfg) = @_; my ($class, $storeid, $scfg) = @_;
my $cache = {};
my $portals = iscsi_portals($scfg->{target}, $scfg->{portal}); my $portals = iscsi_portals($scfg->{target}, $scfg->{portal});
for my $portal (@$portals) { for my $portal (@$portals) {
my $result = iscsi_test_portal($portal); my $result = iscsi_test_portal($scfg->{target}, $portal, $cache);
return $result if $result; return $result if $result;
} }