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

refactor finding next diskname for all plugins

Browse Source 
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
This commit is contained in:
Stoiko Ivanov
2018-09-07 15:08:42 +02:00
committed by Thomas Lamprecht
parent 59fa9fd6a3
commit c4a29df483
8 changed files with 34 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
PVE/Storage/SheepdogPlugin.pm
View File

@ -151,22 +151,9 @@ my $find_free_diskname = sub {
my $sheepdog = sheepdog_ls($scfg, $storeid);
my $dat = $sheepdog->{$storeid};
my $disk_ids = {};
my $disk_list = [ keys %$dat ];
foreach my $image (keys %$dat) {
my $volname = $dat->{$image}->{name};
if ($volname =~ m/(vm|base)-$vmid-disk-(\d+)/){
$disk_ids->{$2} = 1;
}
}
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";
return PVE::Storage::Plugin::get_next_vm_diskname($disk_list, $storeid, $vmid, undef, $scfg);
};
sub create_base {
@ -225,7 +212,7 @@ sub clone_image {
die "clone_image only works on base images\n" if !$isBase;
my $name = &$find_free_diskname($storeid, $scfg, $vmid);
my $name = $find_free_diskname->($storeid, $scfg, $vmid);
warn "clone $volname: $basename to $name\n";
@ -243,7 +230,7 @@ sub alloc_image {
die "illegal name '$name' - sould be 'vm-$vmid-*'\n"
if $name && $name !~ m/^vm-$vmid-/;
$name = &$find_free_diskname($storeid, $scfg, $vmid) if !$name;
$name = $find_free_diskname->($storeid, $scfg, $vmid) if !$name;
my $cmd = &$collie_cmd($scfg, 'vdi', 'create', $name , "${size}k");