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

RBDPlugin: introduce rbd_unittobytes / rbd tends to be human readable

Browse Source 
Signed-off-by: Stefan Priebe <s.priebe@profihost.ag>
This commit is contained in:
Stefan Priebe
2013-01-21 15:27:08 +01:00
committed by Dietmar Maurer
parent db8057dc96
commit 249cb64756
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
PVE/Storage/RBDPlugin.pm
View File

@ -9,6 +9,14 @@ use PVE::JSONSchema qw(get_standard_option);
use base qw(PVE::Storage::Plugin); use base qw(PVE::Storage::Plugin);
sub rbd_unittobytes {
{
"M" => 1024*1024,
"G" => 1024*1024*1024,
"T" => 1024*1024*1024*1024,
}
}
my $rbd_cmd = sub { my $rbd_cmd = sub {
my ($scfg, $storeid, $op, @options) = @_; my ($scfg, $storeid, $op, @options) = @_;
@ -51,12 +59,12 @@ sub rbd_ls {
my $parser = sub { my $parser = sub {
my $line = shift; my $line = shift;
if ($line =~ m/^(vm-(\d+)-disk-\d+)\s+(\d+)M\s((\S+)\/(vm-\d+-\S+@\S+))?/) { if ($line =~ m/^(vm-(\d+)-disk-\d+)\s+(\d+)(M|G|T)\s((\S+)\/(vm-\d+-\S+@\S+))?/) {
my ($image, $owner, $size, $parent) = ($1, $2, $3, $6); my ($image, $owner, $size, $unit, $parent) = ($1, $2, $3, $4, $7);
$list->{$scfg->{pool}}->{$image} = { $list->{$scfg->{pool}}->{$image} = {
name => $image, name => $image,
size => $size*1024*1024, size => $size*rbd_unittobytes()->{$unit},
parent => $parent, parent => $parent,
vmid => $owner vmid => $owner
}; };
@ -83,8 +91,8 @@ sub rbd_volume_info {
my $parser = sub { my $parser = sub {
my $line = shift; my $line = shift;
if ($line =~ m/size (\d+) MB in (\d+) objects/) { if ($line =~ m/size (\d+) (M|G|T)B in (\d+) objects/) {
$size = $1; $size = $1 * rbd_unittobytes()->{$2} if ($1);
} elsif ($line =~ m/parent:\s(\S+)\/(\S+)/) { } elsif ($line =~ m/parent:\s(\S+)\/(\S+)/) {
$parent = $2; $parent = $2;
} }
@ -92,8 +100,6 @@ sub rbd_volume_info {
run_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser); run_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
$size = $size*1024*1024 if $size;
return ($size, $parent); return ($size, $parent);
} }