migrate: only stop NBD if we got a NBD url from the target

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index 7472e9dbb808ff90b89628e10f41cf4881f3c086..76449226cbd77a73f24e409a56173b25e962121f 100644 (file)
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -750,6 +750,7 @@ sub phase2 {
            my $targetdrive = $3;
            $targetdrive =~ s/drive-//g;
 
            my $targetdrive = $3;
            $targetdrive =~ s/drive-//g;
 

+           $self->{stopnbd} = 1;

            $self->{target_drive}->{$targetdrive}->{drivestr} = $drivestr;
            $self->{target_drive}->{$targetdrive}->{nbd_uri} = $nbd_uri;
        } elsif ($line =~ m!^storage migration listens on nbd:unix:(/run/qemu-server/(\d+)_nbd\.migrate):exportname=(\S+) volume:(\S+)$!) {
            $self->{target_drive}->{$targetdrive}->{drivestr} = $drivestr;
            $self->{target_drive}->{$targetdrive}->{nbd_uri} = $nbd_uri;
        } elsif ($line =~ m!^storage migration listens on nbd:unix:(/run/qemu-server/(\d+)_nbd\.migrate):exportname=(\S+) volume:(\S+)$!) {


@@ -760,6 +761,7 @@ sub phase2 {
            my $targetdrive = $3;
            $targetdrive =~ s/drive-//g;
 
            my $targetdrive = $3;
            $targetdrive =~ s/drive-//g;
 

+           $self->{stopnbd} = 1;

            $self->{target_drive}->{$targetdrive}->{drivestr} = $drivestr;
            $self->{target_drive}->{$targetdrive}->{nbd_uri} = $nbd_uri;
            push @$tunnel_addr, "$nbd_unix_addr:$nbd_unix_addr";
            $self->{target_drive}->{$targetdrive}->{drivestr} = $drivestr;
            $self->{target_drive}->{$targetdrive}->{nbd_uri} = $nbd_uri;
            push @$tunnel_addr, "$nbd_unix_addr:$nbd_unix_addr";


@@ -1177,7 +1179,8 @@ sub phase3_cleanup {
     $self->switch_replication_job_target() if $self->{replicated_volumes};
 
     if ($self->{livemigration}) {
     $self->switch_replication_job_target() if $self->{replicated_volumes};
 
     if ($self->{livemigration}) {

-       if ($self->{storage_migration}) {
+       if ($self->{stopnbd}) {
+           $self->log('info', "stopping NBD storage migration server on target.");

            # stop nbd server on remote vm - requirement for resume since 2.9
            my $cmd = [@{$self->{rem_ssh}}, 'qm', 'nbdstop', $vmid];
 
            # stop nbd server on remote vm - requirement for resume since 2.9
            my $cmd = [@{$self->{rem_ssh}}, 'qm', 'nbdstop', $vmid];