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

sheepdog: fix find_next_volume with storeid != 'sheepdog', find display volume size

Browse Source 
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier
2013-06-21 14:40:52 +02:00
committed by Dietmar Maurer
parent 210f7c5dae
commit 9538d0475a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PVE/Storage/SheepdogPlugin.pm
View File

@ -62,7 +62,7 @@ sub sheepdog_ls {
if ($line =~ /(=|c) ((vm|base)-(\d+)-\S+)\s+(\d+)\s+(\d+)\s(\d+)\s(\d+)\s(\d+)\s(\S+)\s(\d+)/) { if ($line =~ /(=|c) ((vm|base)-(\d+)-\S+)\s+(\d+)\s+(\d+)\s(\d+)\s(\d+)\s(\d+)\s(\S+)\s(\d+)/) {
my $image = $2; my $image = $2;
my $owner = $4; my $owner = $4;
my $size = $5; my $size = $6;
my $idvdi = $10; my $idvdi = $10;
my $parentid = $relationship->{$idvdi}->{parent} if $relationship->{$idvdi}->{parent}; my $parentid = $relationship->{$idvdi}->{parent} if $relationship->{$idvdi}->{parent};
my $parent = $relationship->{$parentid}->{name} if $parentid; my $parent = $relationship->{$parentid}->{name} if $parentid;
@ -149,7 +149,7 @@ my $find_free_diskname = sub {
my ($storeid, $scfg, $vmid) = @_; my ($storeid, $scfg, $vmid) = @_;
my $sheepdog = sheepdog_ls($scfg, $storeid); my $sheepdog = sheepdog_ls($scfg, $storeid);
my $dat = $sheepdog->{sheepdog}; my $dat = $sheepdog->{$storeid};
my $disk_ids = {}; my $disk_ids = {};
foreach my $image (keys %$dat) { foreach my $image (keys %$dat) {