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

Use a common interface for find_free_diskname

Browse Source 
We can use 'list_images' to get the desired volume IDs in
'find_free_diskname' for most plugins. For the two LVM plugins, 'list_images'
potentially skips untagged volumes, so we keep the custom version. For the
RBD plugin, 'list_images' is much more costly than the custom version, so we
keep the custom version.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner
2019-12-11 10:25:49 +01:00
committed by Thomas Lamprecht
parent a573f66a2e
commit a44c0147bc
7 changed files with 30 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
PVE/Storage/LVMPlugin.pm
View File

@ -303,8 +303,12 @@ sub clone_image {
die "can't clone images in lvm storage\n";
}
sub lvm_find_free_diskname {
my ($lvs, $vg, $storeid, $vmid, $scfg) = @_;
sub find_free_diskname {
my ($class, $storeid, $scfg, $vmid, $fmt, $add_fmt_suffix) = @_;
my $vg = $scfg->{vgname};
my $lvs = lvm_list_volumes($vg);
my $disk_list = [ keys %{$lvs->{$vg}} ];
@ -345,7 +349,7 @@ sub alloc_image {
die "not enough free space ($free < $size)\n" if $free < $size;
$name = lvm_find_free_diskname(lvm_list_volumes($vg), $vg, $storeid, $vmid, $scfg)
$name = $class->find_free_diskname($storeid, $scfg, $vmid)
if !$name;
lvcreate($vg, $name, $size, ["pve-vm-$vmid"]);