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

ISCSI: whitespace cleanup

Browse Source 
Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
This commit is contained in:
Aaron Lauterer
2020-03-02 08:52:06 +01:00
committed by Thomas Lamprecht
parent 42b988f735
commit 4f430a43ba
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
PVE/Storage/ISCSIPlugin.pm
View File

@ -43,11 +43,11 @@ sub iscsi_session_list {
eval { eval {
run_command($cmd, errmsg => 'iscsi session scan failed', outfunc => sub { run_command($cmd, errmsg => 'iscsi session scan failed', outfunc => sub {
my $line = shift; my $line = shift;
if ($line =~ m/^tcp:\s+\[(\S+)\]\s+\S+\s+(\S+)(\s+\S+)?\s*$/) { if ($line =~ m/^tcp:\s+\[(\S+)\]\s+\S+\s+(\S+)(\s+\S+)?\s*$/) {
my ($session, $target) = ($1, $2); my ($session, $target) = ($1, $2);
# there can be several sessions per target (multipath) # there can be several sessions per target (multipath)
push @{$res->{$target}}, $session; push @{$res->{$target}}, $session;
} }
}); });
}; };
@ -71,7 +71,7 @@ sub iscsi_discovery {
check_iscsi_support (); check_iscsi_support ();
my $cmd = [$ISCSIADM, '--mode', 'discovery', '--type', 'sendtargets', my $cmd = [$ISCSIADM, '--mode', 'discovery', '--type', 'sendtargets',
'--portal', $portal]; '--portal', $portal];
my $res = {}; my $res = {};
@ -151,7 +151,7 @@ sub load_stable_scsi_paths {
if (my $dh = IO::Dir->new($stabledir)) { if (my $dh = IO::Dir->new($stabledir)) {
while (defined(my $tmp = $dh->read)) { while (defined(my $tmp = $dh->read)) {
# exclude filenames with part in name (same disk but partitions) # exclude filenames with part in name (same disk but partitions)
# use only filenames with scsi(with multipath i have the same device # use only filenames with scsi(with multipath i have the same device
# with dm-uuid-mpath , dm-name and scsi in name) # with dm-uuid-mpath , dm-name and scsi in name)
if($tmp !~ m/-part\d+$/ && $tmp =~ m/^scsi-/) { if($tmp !~ m/-part\d+$/ && $tmp =~ m/^scsi-/) {
my $path = "$stabledir/$tmp"; my $path = "$stabledir/$tmp";
@ -197,8 +197,8 @@ sub iscsi_device_list {
} }
return if !$bdev; return if !$bdev;
#check multipath #check multipath
if (-d "/sys/block/$bdev/holders") { if (-d "/sys/block/$bdev/holders") {
my $multipathdev = dir_glob_regex("/sys/block/$bdev/holders", '[A-Za-z]\S*'); my $multipathdev = dir_glob_regex("/sys/block/$bdev/holders", '[A-Za-z]\S*');
$bdev = $multipathdev if $multipathdev; $bdev = $multipathdev if $multipathdev;
} }
@ -212,15 +212,15 @@ sub iscsi_device_list {
my $volid = "$channel.$id.$lun.$blockdev"; my $volid = "$channel.$id.$lun.$blockdev";
$res->{$target}->{$volid} = { $res->{$target}->{$volid} = {
'format' => 'raw', 'format' => 'raw',
'size' => int($size * 512), 'size' => int($size * 512),
'vmid' => 0, # not assigned to any vm 'vmid' => 0, # not assigned to any vm
'channel' => int($channel), 'channel' => int($channel),
'id' => int($id), 'id' => int($id),
'lun' => int($lun), 'lun' => int($lun),
}; };
#print "TEST: $target $session $host,$bus,$tg,$lun $blockdev\n"; #print "TEST: $target $session $host,$bus,$tg,$lun $blockdev\n";
}); });
}); });
@ -283,7 +283,7 @@ sub filesystem_path {
die "snapshot is not possible on iscsi storage\n" if defined($snapname); die "snapshot is not possible on iscsi storage\n" if defined($snapname);
my ($vtype, $name, $vmid) = $class->parse_volname($volname); my ($vtype, $name, $vmid) = $class->parse_volname($volname);
my $path = "/dev/disk/by-id/$name"; my $path = "/dev/disk/by-id/$name";
return wantarray ? ($path, $vmid, $vtype) : $path; return wantarray ? ($path, $vmid, $vtype) : $path;