[pve-devel] applied: [PATCH qemu-server 1/2] Fix #1441: Do not unplug controllers when the mirroring is finished

[Wolfgang Bumiller]

Applied both patches.
Can't reproduce the delays, getting equal results with and without the
change.

On Thu, Jul 27, 2017 at 02:32:26PM +0200, Emmanuel Kasper wrote:
> This should not be needed since we call 'block-job-complete' before
> in qemu_drive_mirror_monitor(), and after benchmarking it does not
> appear to be needed nor provide a measurable improvement when shutting
> down the source.
> ---
>  PVE/QemuMigrate.pm | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
> index f995584..ac2884b 100644
> --- a/PVE/QemuMigrate.pm
> +++ b/PVE/QemuMigrate.pm
> @@ -892,11 +892,6 @@ sub phase3_cleanup {
>  
>      if ($self->{livemigration}) {
>  	if ($self->{storage_migration}) {
> -	    # remove drives referencing the nbd server from source
> -	    # otherwise vm_stop might hang later on
> -	    foreach my $drive (keys %{$self->{target_drive}}){
> -		PVE::QemuServer::vm_mon_cmd_nocheck($vmid, "device_del", id => $drive);
> -	    }
>  	    # stop nbd server on remote vm - requirement for resume since 2.9
>  	    my $cmd = [@{$self->{rem_ssh}}, 'qm', 'nbdstop', $vmid];
>  
> -- 
> 2.11.0