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

rbd: get volume size for volumes list

Browse Source 
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier
2012-10-16 16:38:13 +02:00
committed by Dietmar Maurer
parent 6958944439
commit e110213e71
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
PVE/Storage/RBDPlugin.pm
View File

@ -56,7 +56,7 @@ sub rbd_ls {
$list->{$scfg->{pool}}->{$image} = { $list->{$scfg->{pool}}->{$image} = {
name => $image, name => $image,
size => 0, size => rbd_volume_size($scfg, $storeid, $image),
vmid => $owner vmid => $owner
}; };
} }
@ -72,6 +72,26 @@ sub rbd_ls {
return $list; return $list;
} }
sub rbd_volume_size {
my ($scfg, $storeid, $volname) = @_;
my $cmd = &$rbd_cmd($scfg, $storeid, 'info', $volname);
my $size = undef;
my $parser = sub {
my $line = shift;
if ($line =~ m/size (\d+) MB in (\d+) objects/) {
$size = $1;
}
};
run_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
$size = $size*1024*1024 if $size;
return $size;
}
sub addslashes { sub addslashes {
my $text = shift; my $text = shift;
$text =~ s/;/\\;/g; $text =~ s/;/\\;/g;
@ -282,21 +302,7 @@ sub deactivate_volume {
sub volume_size_info { sub volume_size_info {
my ($class, $scfg, $storeid, $volname, $timeout) = @_; my ($class, $scfg, $storeid, $volname, $timeout) = @_;
my $cmd = &$rbd_cmd($scfg, $storeid, 'info', $volname); return rbd_volume_size($scfg, $storeid, $volname);
my $size = undef;
my $parser = sub {
my $line = shift;
if ($line =~ m/size (\d+) MB in (\d+) objects/) {
$size = $1;
}
};
run_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
$size = $size*1024*1024 if $size;
return $size;
} }
sub volume_resize { sub volume_resize {