migrate: cleanup nbd source disks earlier

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index b513a675c47d5ce1eda8052a496ca8acd2d9c156..04118bd6554c42c75a8b17281de80546274b8336 100644 (file)
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -885,6 +885,11 @@ 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];