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

Fixed Istgt LUN Options handling.

Browse Source 
Signed-off-by: Chris Allen <Chris Allen>
This commit is contained in:
Chris Allen
2014-03-11 10:46:24 -07:00
committed by Dietmar Maurer
parent c521e801ae
commit 551534a3bc
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
PVE/Storage/LunCmd/Istgt.pm
View File

@ -284,9 +284,15 @@ my $parser = sub {
} elsif ($lun) { } elsif ($lun) {
next if (($_ =~ /^\s*#/) || ($_ =~ /^\s*$/)); next if (($_ =~ /^\s*#/) || ($_ =~ /^\s*$/));
if ($_ =~ /^\s*(\w+)\s+(.+)\s*/) { if ($_ =~ /^\s*(\w+)\s+(.+)\s*/) {
next if $2 =~ /^Option.*/; my $arg1 = $1;
$SETTINGS->{$lun}->{$1} = $2; $2 =~ s/^\s+|\s+$|"\s*//g;
$SETTINGS->{$lun}->{$1} =~ s/^\s+|\s+$|"\s*//g; if ($2 =~ /^Storage\s*(.+)/i) {
$SETTINGS->{$lun}->{$arg1}->{storage} = $1;
} elsif ($2 =~ /^Option\s*(.+)/i) {
push @{$SETTINGS->{$lun}->{$arg1}->{options}}, $1;
} else {
$SETTINGS->{$lun}->{$arg1} = $2;
}
} else { } else {
die "$line: parse error [$_]"; die "$line: parse error [$_]";
} }
@ -305,19 +311,23 @@ my $parser = sub {
my $lu = (); my $lu = ();
while ((my $key, my $val) = each(%{$SETTINGS->{"LogicalUnit$i"}})) { while ((my $key, my $val) = each(%{$SETTINGS->{"LogicalUnit$i"}})) {
if ($key =~ /^LUN\d+/) { if ($key =~ /^LUN\d+/) {
if ($val =~ /^Storage\s+([\w\/\-]+)\s+(\w+)/) { $val->{storage} =~ /^([\w\/\-]+)\s+(\w+)/;
my $storage = $1; my $storage = $1;
my $size = $parse_size->($2); my $size = $parse_size->($2);
my $conf = undef; my $conf = undef;
if ($storage =~ /^$base\/$scfg->{pool}\/([\w\-]+)$/) { my @options = ();
$conf = { if ($val->{options}) {
lun => $key, @options = @{$val->{options}};
Storage => $storage,
Size => $size,
};
}
push @$lu, $conf if $conf;
} }
if ($storage =~ /^$base\/$scfg->{pool}\/([\w\-]+)$/) {
$conf = {
lun => $key,
Storage => $storage,
Size => $size,
options => @options,
}
}
push @$lu, $conf if $conf;
delete $SETTINGS->{"LogicalUnit$i"}->{$key}; delete $SETTINGS->{"LogicalUnit$i"}->{$key};
} }
} }