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

rbd: fix: move find_free_diskname + fix trailing whitespace

Browse Source 
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier
2013-02-05 12:55:35 +01:00
committed by Dietmar Maurer
parent f27082855d
commit 5b9b9b1449
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
PVE/Storage/RBDPlugin.pm
View File

@ -208,6 +208,29 @@ sub path {
return ($path, $vmid, $vtype); return ($path, $vmid, $vtype);
} }
my $find_free_diskname = sub {
my ($storeid, $scfg, $vmid) = @_;
my $rbd = rbd_ls($scfg, $storeid);
my $disk_ids = {};
my $dat = $rbd->{$scfg->{pool}};
foreach my $image (keys %$dat) {
my $volname = $dat->{$image}->{name};
if ($volname =~ m/(vm|base)-$vmid-disk-(\d+)/){
$disk_ids->{$2} = 1;
}
}
#fix: can we search in $rbd hash key with a regex to find (vm|base) ?
for (my $i = 1; $i < 100; $i++) {
if (!$disk_ids->{$i}) {
return "vm-$vmid-disk-$i";
}
}
die "unable to allocate an image name for VM $vmid in storage '$storeid'\n";
};
sub create_base { sub create_base {
my ($class, $storeid, $scfg, $volname) = @_; my ($class, $storeid, $scfg, $volname) = @_;
@ -271,29 +294,6 @@ sub clone_image {
return $newvol; return $newvol;
} }
my $find_free_diskname = sub {
my ($storeid, $scfg, $vmid) = @_;
my $rbd = rbd_ls($scfg, $storeid);
my $disk_ids = {};
my $dat = $rbd->{$scfg->{pool}};
foreach my $image (keys %$dat) {
my $volname = $dat->{$image}->{name};
if ($volname =~ m/(vm|base)-$vmid-disk-(\d+)/){
$disk_ids->{$2} = 1;
}
}
#fix: can we search in $rbd hash key with a regex to find (vm|base) ?
for (my $i = 1; $i < 100; $i++) {
if (!$disk_ids->{$i}) {
return "vm-$vmid-disk-$i";
}
}
die "unable to allocate an image name for VM $vmid in storage '$storeid'\n";
};
sub alloc_image { sub alloc_image {
my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size) = @_; my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size) = @_;