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

iscis: add iscsi_session helper

Browse Source 
allows to write some code sligthly nicer

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2020-03-03 10:49:11 +01:00
parent c29bad0d90
commit 553c9b21a7
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
PVE/Storage/ISCSIPlugin.pm
View File

@ -350,12 +350,17 @@ sub list_images {
return $res;
}
sub iscsi_session {
my ($cache, $target) = @_;
$cache->{iscsi_sessions} = iscsi_session_list() if !$cache->{iscsi_sessions};
return $cache->{iscsi_sessions}->{$target};
}
sub status {
my ($class, $storeid, $scfg, $cache) = @_;
$cache->{iscsi_sessions} = iscsi_session_list() if !$cache->{iscsi_sessions};
my $active = defined($cache->{iscsi_sessions}->{$scfg->{target}}) + 0;
my $session = iscsi_session($cache, $scfg->{target});
my $active = defined($session) ? 1 : 0;
return (0, 0, 0, $active);
}
@ -365,15 +370,14 @@ sub activate_storage {
return if !check_iscsi_support(1);
$cache->{iscsi_sessions} = iscsi_session_list() if !$cache->{iscsi_sessions};
my $session = iscsi_session($cache, $scfg->{target});
my $iscsi_sess = $cache->{iscsi_sessions}->{$scfg->{target}};
if (!defined ($iscsi_sess)) {
if (!defined ($session)) {
eval { iscsi_login($scfg->{target}, $scfg->{portal}); };
warn $@ if $@;
} else {
# make sure we get all devices
iscsi_session_rescan($iscsi_sess);
iscsi_session_rescan($session);
}
}
@ -382,11 +386,7 @@ sub deactivate_storage {
return if !check_iscsi_support(1);
$cache->{iscsi_sessions} = iscsi_session_list() if !$cache->{iscsi_sessions};
my $iscsi_sess = $cache->{iscsi_sessions}->{$scfg->{target}};
if (defined ($iscsi_sess)) {
if (defined(iscsi_session($cache, $scfg->{target}))) {
iscsi_logout($scfg->{target}, $scfg->{portal});
}
}