From 50ba40ec59a57c4966610932a30697ee7fd966d5 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 17 Jun 2020 15:45:56 +0200 Subject: [PATCH] vzdump: move VMID sorting to check_vmids Signed-off-by: Thomas Lamprecht --- PVE/VZDump.pm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index 747f3416..dceeb9ca 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -166,7 +166,7 @@ sub check_vmids { my (@vmids) = @_; my $res = []; - foreach my $vmid (@vmids) { + for my $vmid (sort {$a <=> $b} @vmids) { die "ERROR: strange VM ID '${vmid}'\n" if $vmid !~ m/^\d+$/; $vmid = int ($vmid); # remove leading zeros next if !$vmid; @@ -1187,15 +1187,12 @@ sub get_included_guests { push @$vmids, $id; } } - $vmids = [ sort {$a <=> $b} @$vmids]; - - $vmids = PVE::VZDump::check_vmids(@$vmids); - - foreach my $vmid (@$vmids) { - my $vmid_data = $vmlist->{ids}->{$vmid}; - my $node = $vmid_data->{node}; + $vmids = check_vmids(@$vmids); + for my $vmid (@$vmids) { + my $node = $vmlist->{ids}->{$vmid}->{node}; next if (defined $job->{node} && $job->{node} ne $node); + push @{$vmids_per_node->{$node}}, $vmid; }