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

iscsi: code cleanup

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2021-05-04 12:02:47 +02:00
parent 9177cc2eda
commit a1e09e496e
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
PVE/Storage/ISCSIPlugin.pm
View File

@ -73,13 +73,10 @@ sub iscsi_discovery {
check_iscsi_support (); check_iscsi_support ();
my $cmd = [$ISCSIADM, '--mode', 'discovery', '--type', 'sendtargets',
'--portal', $portal];
my $res = {}; my $res = {};
return $res if !iscsi_test_portal($portal); # fixme: raise exception here? return $res if !iscsi_test_portal($portal); # fixme: raise exception here?
my $cmd = [$ISCSIADM, '--mode', 'discovery', '--type', 'sendtargets', '--portal', $portal];
run_command($cmd, outfunc => sub { run_command($cmd, outfunc => sub {
my $line = shift; my $line = shift;
@ -97,22 +94,20 @@ sub iscsi_discovery {
sub iscsi_login { sub iscsi_login {
my ($target, $portal_in) = @_; my ($target, $portal_in) = @_;
check_iscsi_support (); check_iscsi_support();
eval { iscsi_discovery ($portal_in); }; eval { iscsi_discovery($portal_in); };
warn $@ if $@; warn $@ if $@;
my $cmd = [$ISCSIADM, '--mode', 'node', '--targetname', $target, '--login']; run_command([$ISCSIADM, '--mode', 'node', '--targetname', $target, '--login']);
run_command($cmd);
} }
sub iscsi_logout { sub iscsi_logout {
my ($target, $portal) = @_; my ($target, $portal) = @_;
check_iscsi_support (); check_iscsi_support();
my $cmd = [$ISCSIADM, '--mode', 'node', '--targetname', $target, '--logout']; run_command([$ISCSIADM, '--mode', 'node', '--targetname', $target, '--logout']);
run_command($cmd);
} }
my $rescan_filename = "/var/run/pve-iscsi-rescan.lock"; my $rescan_filename = "/var/run/pve-iscsi-rescan.lock";