From 5b9b9b1449a2cb767709b32f085519258cfbe25c Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Tue, 5 Feb 2013 12:55:35 +0100 Subject: [PATCH] rbd: fix: move find_free_diskname + fix trailing whitespace Signed-off-by: Alexandre Derumier --- PVE/Storage/RBDPlugin.pm | 46 ++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm index 4936d8f..eee2c72 100644 --- a/PVE/Storage/RBDPlugin.pm +++ b/PVE/Storage/RBDPlugin.pm @@ -208,6 +208,29 @@ sub path { 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 { my ($class, $storeid, $scfg, $volname) = @_; @@ -271,29 +294,6 @@ sub clone_image { 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 { my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size) = @_; -- 2.39.5