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

15
PVE/Storage/DRBDPlugin.pm
View File

@ -177,21 +177,10 @@ sub alloc_image {
my $hdl = connect_drbdmanage_service();
my $volumes = drbd_list_volumes($hdl);
my $disk_list = [ keys %$volumes ];
die "volume '$name' already exists\n" if defined($name) && $volumes->{$name};
if (!defined($name)) {
for (my $i = 1; $i < 100; $i++) {
my $tn = "vm-$vmid-disk-$i";
if (!defined ($volumes->{$tn})) {
$name = $tn;
last;
}
}
}
die "unable to allocate an image name for VM $vmid in storage '$storeid'\n"
if !defined($name);
$name //= PVE::Storage::Plugin::get_next_vm_diskname($disk_list, $storeid, $vmid, undef, $scfg);
my ($rc, $res) = $hdl->create_resource($name, {});
check_drbd_res($rc);