rbd : find_free_diskname

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier
2013-02-05 12:55:32 +01:00
committed by Dietmar Maurer
parent ca1e168ad3
commit 8b3ae5180b

View File

@ -206,6 +206,29 @@ sub clone_image {
die "not implemented";
}
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 {
my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size) = @_;
@ -213,20 +236,7 @@ sub alloc_image {
die "illegal name '$name' - sould be 'vm-$vmid-*'\n"
if $name && $name !~ m/^vm-$vmid-/;
if (!$name) {
my $rdb = rbd_ls($scfg, $storeid);
for (my $i = 1; $i < 100; $i++) {
my $tn = "vm-$vmid-disk-$i";
if (!defined ($rdb->{$scfg->{pool}}->{$tn})) {
$name = $tn;
last;
}
}
}
die "unable to allocate an image name for VM $vmid in storage '$storeid'\n"
if !$name;
$name = &$find_free_diskname($storeid, $scfg, $vmid);
my $cmd = &$rbd_cmd($scfg, $storeid, 'create', '--format' , 2, '--size', ($size/1024), $name);
run_command($cmd, errmsg => "rbd create $name' error", errfunc => sub {});