Proxmox/pve-storage
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-storage.git synced 2025-01-11 05:18:01 +03:00
Code Releases Activity

ISCSIDirect : fixes and cleanup

Browse Source 
-use "lunX" for volume name.
previously it was only the lun number, and it conflict with current syntax to disk alloc disk size.

-scsi-ls return size in Gb, so we need to convert to bytes

-small cleanups

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2012-08-05 10:16:49 +02:00 committed by Dietmar Maurer
parent 60301ee037
commit 3a0c324642
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
PVE/Storage/ISCSIDirectPlugin.pm
View File

@ -17,29 +17,25 @@ sub iscsi_ls {
my $portal = $scfg->{portal};
my $cmd = ['/usr/bin/iscsi-ls', '-s', 'iscsi://'.$portal ];
my $list = {};
my $test = "";
my $errfunc = sub {
my $line = shift;
$line = trim($line);
die $line if $line;
};
my %unittobytes = (
"k" => 1024,
"M" => 1024*1024,
"G" => 1024*1024*1024,
"T" => 1024*1024*1024*1024
);
eval {
run_command($cmd, errmsg => "iscsi error", errfunc => $errfunc, outfunc => sub {
run_command($cmd, errmsg => "iscsi error", errfunc => sub {}, outfunc => sub {
my $line = shift;
$line = trim($line);
if( $line =~ /Lun:(\d+)\s+([A-Za-z0-9\-\_\.\:]*)\s+\(Size:(\d+)G\)/ ) {
$test = $1;
my $image = $1;
if( $line =~ /Lun:(\d+)\s+([A-Za-z0-9\-\_\.\:]*)\s+\(Size:([0-9\.]*)(k|M|G|T)\)/ ) {
my $image = "lun".$1;
my $size = $3;
my $unit = $4;
$list->{$storeid}->{$image} = {
name => $image,
size => $size,
size => $size * $unittobytes{$unit},
};
}
});
@ -47,7 +43,9 @@ sub iscsi_ls {
my $err = $@;
die $err if $err && $err !~ m/TESTUNITREADY failed with SENSE KEY/ ;
return $list;
}
# Configuration
@ -78,7 +76,7 @@ sub parse_volname {
my ($class, $volname) = @_;
if ($volname =~ m/^(\d+)$/) {
if ($volname =~ m/^lun(\d+)$/) {
return ('images', $1, undef);
}