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

19
PVE/Storage/ZFSPoolPlugin.pm
View File

@ -388,26 +388,11 @@ sub zfs_list_zvol {
sub zfs_find_free_diskname {
my ($class, $storeid, $scfg, $vmid, $format) = @_;
my $name = undef;
my $volumes = $class->zfs_list_zvol($scfg);
my $disk_ids = {};
my $dat = $volumes->{$scfg->{pool}};
foreach my $image (keys %$dat) {
my $volname = $dat->{$image}->{name};
if ($volname =~ m/(vm|base|subvol|basevol)-$vmid-disk-(\d+)/){
$disk_ids->{$2} = 1;
}
}
for (my $i = 1; $i < 100; $i++) {
if (!$disk_ids->{$i}) {
return $format eq 'subvol' ? "subvol-$vmid-disk-$i" : "vm-$vmid-disk-$i";
}
}
die "unable to allocate an image name for VM $vmid in storage '$storeid'\n";
my $disk_list = [ keys %$dat ];
return PVE::Storage::Plugin::get_next_vm_diskname($disk_list, $storeid, $vmid, $format, $scfg);
}
sub zfs_get_latest_snapshot {