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

refactor is_valid_vm_diskname to private simpler sub

Browse Source 
This was newly introduced and is only used once, so having a
wantarray return mechanism, without ever using it or knowing for sure
if this may help with reuse of the method is not ideal.

Make the sub a module private one just returning the vm disk number
or explicit undef. Pass it the $suffix variable, to avoid recomputing
it every time called by out caller's loop.

If there's re-use potential in the future we can actually decide what
makes sense to return.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2018-09-10 10:11:22 +02:00
parent c4a29df483
commit 83a40b8d3b
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
PVE/Storage/Plugin.pm
View File

@ -525,12 +525,8 @@ sub create_base {
return $newvolname; return $newvolname;
} }
sub is_valid_vm_diskname { my $get_vm_disk_number = sub {
my ($disk_name, $scfg, $vmid, $fmt, $add_fmt_suffix) = @_; my ($disk_name, $scfg, $vmid, $suffix) = @_;
$vmid = qr/\d+/ if !defined($vmid);
my $suffix = (defined($fmt) && $add_fmt_suffix) ? ".$fmt" : '';
my $type = $scfg->{type}; my $type = $scfg->{type};
my $def = $defaultData->{plugindata}->{$type}; my $def = $defaultData->{plugindata}->{$type};
@ -541,24 +537,25 @@ sub is_valid_vm_diskname {
if $valid_formats->{subvol}; if $valid_formats->{subvol};
if ($disk_name =~ m/$disk_regex/) { if ($disk_name =~ m/$disk_regex/) {
return wantarray ? (1, $2) : 1; return $2;
}
} }
return undef;
};
sub get_next_vm_diskname { sub get_next_vm_diskname {
my ($disk_list, $storeid, $vmid, $fmt, $scfg, $add_fmt_suffix) = @_; my ($disk_list, $storeid, $vmid, $fmt, $scfg, $add_fmt_suffix) = @_;
my $disk_ids = {};
my ($match, $disknum);
foreach my $disk (@$disk_list) {
($match, $disknum) = is_valid_vm_diskname($disk, $scfg, $vmid, $fmt, $add_fmt_suffix);
$disk_ids->{$disknum} = 1 if $match;
}
$fmt //= ''; $fmt //= '';
my $prefix = ($fmt eq 'subvol') ? 'subvol' : 'vm'; my $prefix = ($fmt eq 'subvol') ? 'subvol' : 'vm';
my $suffix = $add_fmt_suffix ? ".$fmt" : ''; my $suffix = $add_fmt_suffix ? ".$fmt" : '';
my $disk_ids = {};
foreach my $disk (@$disk_list) {
my $disknum = $get_vm_disk_number->($disk, $scfg, $vmid, $suffix);
$disk_ids->{$disknum} = 1 if defined($disknum);
}
for (my $i = 0; $i < $MAX_VOLUMES_PER_GUEST; $i++) { for (my $i = 0; $i < $MAX_VOLUMES_PER_GUEST; $i++) {
if (!$disk_ids->{$i}) { if (!$disk_ids->{$i}) {
return "$prefix-$vmid-disk-$i$suffix"; return "$prefix-$vmid-disk-$i$suffix";