restore vma: fix applying storage-specific bandwidth limit

At this stage, there are no keys in %storage_limits to iterate over. The
refactoring in commit 9f3d73bc35 broke the logic
by accident.

Also explicitly set zero if there is no limit to avoid repeating the
get_bandwith_limit call for the same storage. When accessing the value later,
zero is already correctly handled as 'no limit'.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2021-03-15 12:57:27 +01:00 committed by Thomas Lamprecht
parent 8e6bcc507a
commit c89642784d

View File

@ -6400,11 +6400,13 @@ sub restore_vma_archive {
my $virtdev_hash = $parse_backup_hints->($rpcenv, $user, $cfg, $fh, $devinfo, $opts);
foreach my $key (keys %storage_limits) {
my $limit = PVE::Storage::get_bandwidth_limit('restore', [$key], $bwlimit);
next if !$limit;
print STDERR "rate limit for storage $key: $limit KiB/s\n";
$storage_limits{$key} = $limit * 1024;
foreach my $info (values %{$virtdev_hash}) {
my $storeid = $info->{storeid};
next if defined($storage_limits{$storeid});
my $limit = PVE::Storage::get_bandwidth_limit('restore', [$storeid], $bwlimit) // 0;
print STDERR "rate limit for storage $storeid: $limit KiB/s\n" if $limit;
$storage_limits{$storeid} = $limit * 1024;
}
foreach my $devname (keys %$devinfo) {