proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-10-04 22:38:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2020-04-29 16:18:55 +02:00
parent 0b953b8e34
commit 3e802221e1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PVE/QemuMigrate.pm
View File

@ -750,6 +750,7 @@ sub phase2 {
my $targetdrive = $3; my $targetdrive = $3;
$targetdrive =~ s/drive-//g; $targetdrive =~ s/drive-//g;
$self->{stopnbd} = 1;
$self->{target_drive}->{$targetdrive}->{drivestr} = $drivestr; $self->{target_drive}->{$targetdrive}->{drivestr} = $drivestr;
$self->{target_drive}->{$targetdrive}->{nbd_uri} = $nbd_uri; $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+)$!) { } 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; my $targetdrive = $3;
$targetdrive =~ s/drive-//g; $targetdrive =~ s/drive-//g;
$self->{stopnbd} = 1;
$self->{target_drive}->{$targetdrive}->{drivestr} = $drivestr; $self->{target_drive}->{$targetdrive}->{drivestr} = $drivestr;
$self->{target_drive}->{$targetdrive}->{nbd_uri} = $nbd_uri; $self->{target_drive}->{$targetdrive}->{nbd_uri} = $nbd_uri;
push @$tunnel_addr, "$nbd_unix_addr:$nbd_unix_addr"; 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}; $self->switch_replication_job_target() if $self->{replicated_volumes};
if ($self->{livemigration}) { 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 # stop nbd server on remote vm - requirement for resume since 2.9
my $cmd = [@{$self->{rem_ssh}}, 'qm', 'nbdstop', $vmid]; my $cmd = [@{$self->{rem_ssh}}, 'qm', 'nbdstop', $vmid];