proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-16 09:27:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vzdump: move VMID sorting to check_vmids

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2020-06-17 15:45:56 +02:00
parent 05447e0459
commit 50ba40ec59
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PVE/VZDump.pm
View File

@ -166,7 +166,7 @@ sub check_vmids {
my (@vmids) = @_; my (@vmids) = @_;
my $res = []; my $res = [];
foreach my $vmid (@vmids) { for my $vmid (sort {$a <=> $b} @vmids) {
die "ERROR: strange VM ID '${vmid}'\n" if $vmid !~ m/^\d+$/; die "ERROR: strange VM ID '${vmid}'\n" if $vmid !~ m/^\d+$/;
$vmid = int ($vmid); # remove leading zeros $vmid = int ($vmid); # remove leading zeros
next if !$vmid; next if !$vmid;
@ -1187,15 +1187,12 @@ sub get_included_guests {
push @$vmids, $id; push @$vmids, $id;
} }
} }
$vmids = [ sort {$a <=> $b} @$vmids]; $vmids = check_vmids(@$vmids);
$vmids = PVE::VZDump::check_vmids(@$vmids);
foreach my $vmid (@$vmids) {
my $vmid_data = $vmlist->{ids}->{$vmid};
my $node = $vmid_data->{node};
for my $vmid (@$vmids) {
my $node = $vmlist->{ids}->{$vmid}->{node};
next if (defined $job->{node} && $job->{node} ne $node); next if (defined $job->{node} && $job->{node} ne $node);
push @{$vmids_per_node->{$node}}, $vmid; push @{$vmids_per_node->{$node}}, $vmid;
} }