proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-07 07:02:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

migrate: don't accidentally take NBD code paths

Browse Source 
by avoiding auto-vivification of $self->{online_local_volumes} via
iteration. most code paths don't care whether it's undef or a reference
to an empty list, but this caused the (already) fixed bug of calling
nbd_stop without having started an NBD server in the first place.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2020-04-30 09:35:29 +02:00 committed by Thomas Lamprecht
parent a4c7029dd8
commit 6f4b11e9db
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PVE/QemuMigrate.pm
View File

@ -713,10 +713,14 @@ sub phase2 {
$input .= "nbd_protocol_version: $nbd_protocol_version\n"; $input .= "nbd_protocol_version: $nbd_protocol_version\n";
my $number_of_online_replicated_volumes = 0; my $number_of_online_replicated_volumes = 0;
foreach my $volid (@{$self->{online_local_volumes}}) {
next if !$self->{replicated_volumes}->{$volid}; # prevent auto-vivification
$number_of_online_replicated_volumes++; if ($self->{online_local_volumes}) {
$input .= "replicated_volume: $volid\n"; foreach my $volid (@{$self->{online_local_volumes}}) {
next if !$self->{replicated_volumes}->{$volid};
$number_of_online_replicated_volumes++;
$input .= "replicated_volume: $volid\n";
}
} }
my $target_replicated_volumes = {}; my $target_replicated_volumes = {};