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

sheepdog : fix volume_size_info && parentid check

Browse Source 
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier
2012-12-12 13:02:33 +01:00
committed by Dietmar Maurer
parent ba4ee9ba25
commit 73b6f89b3c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/Storage/SheepdogPlugin.pm
View File

@ -65,7 +65,7 @@ sub sheepdog_ls {
my $size = $4; my $size = $4;
my $idvdi = $9; my $idvdi = $9;
my $parentid = $relationship->{$idvdi}->{parent} if $relationship->{$idvdi}->{parent}; my $parentid = $relationship->{$idvdi}->{parent} if $relationship->{$idvdi}->{parent};
my $parent = $relationship->{$parentid}->{name}; my $parent = $relationship->{$parentid}->{name} if $parentid;
$list->{$storeid}->{$image} = { $list->{$storeid}->{$image} = {
name => $image, name => $image,
size => $size, size => $size,
@ -272,13 +272,13 @@ sub volume_size_info {
my $size = undef; my $size = undef;
my $cmd = &$collie_cmd($scfg, 'vdi', 'list', '-r', $volname); my $cmd = &$collie_cmd($scfg, 'vdi', 'list', '-r');
run_command($cmd, outfunc => sub { run_command($cmd, outfunc => sub {
my $line = shift; my $line = shift;
$line = trim($line); $line = trim($line);
if ($line =~ /= (vm-(\d+)-\S+)\s+(\d+)\s+(\d+)\s(\d+)\s(\d+)\s/) { if ($line =~ /(=|c) $volname\s+(\d+)\s+(\d+)\s(\d+)\s(\d+)\s/) {
$size = $4; $size = $3;
} }
}); });