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

15
PVE/Storage/GlusterfsPlugin.pm
View File

@ -160,17 +160,6 @@ sub parse_name_dir {
die "unable to parse volume filename '$name'\n";
}
my $find_free_diskname = sub {
my ($imgdir, $vmid, $fmt, $scfg) = @_;
my $disk_list = [];
my $dh = IO::Dir->new ($imgdir);
@$disk_list = $dh->read() if defined($dh);
return PVE::Storage::Plugin::get_next_vm_diskname($disk_list, $imgdir, $vmid, $fmt, $scfg, 1);
};
sub path {
my ($class, $scfg, $volname, $storeid, $snapname) = @_;
@ -225,7 +214,7 @@ sub clone_image {
mkpath $imagedir;
my $name = $find_free_diskname->($imagedir, $vmid, "qcow2", $scfg);
my $name = $class->find_free_diskname($imagedir, $scfg, $vmid, "qcow2", 1);
warn "clone $volname: $vtype, $name, $vmid to $name (base=../$basevmid/$basename)\n";
@ -253,7 +242,7 @@ sub alloc_image {
mkpath $imagedir;
$name = $find_free_diskname->($imagedir, $vmid, $fmt, $scfg) if !$name;
$name = $class->find_free_diskname($imagedir, $scfg, $vmid, $fmt, 1) if !$name;
my (undef, $tmpfmt) = parse_name_dir($name);