proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-29 18:45:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

close tunnel after migration is finish.

Browse Source 
if we do not close it, there is a change that the tunnel stays open and the next migration will not work.
This commit is contained in:
Wolfgang Link 2016-02-02 11:53:17 +01:00 committed by Dietmar Maurer
parent 7d4e30f389
commit 386c6ba7f5
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
PVE/QemuMigrate.pm
View File

@ -520,6 +520,14 @@ sub phase2 {
die "unable to parse migration status '$stat->{status}' - aborting\n"; die "unable to parse migration status '$stat->{status}' - aborting\n";
} }
} }
#to be sure tat the tunnel is closed
if ($self->{tunnel}) {
eval { finish_tunnel($self, $self->{tunnel}); };
if (my $err = $@) {
$self->log('err', $err);
$self->{errors} = 1;
}
}
} }
sub phase2_cleanup { sub phase2_cleanup {
@ -552,6 +560,14 @@ sub phase2_cleanup {
$self->log('err', $err); $self->log('err', $err);
$self->{errors} = 1; $self->{errors} = 1;
} }
if ($self->{tunnel}) {
eval { finish_tunnel($self, $self->{tunnel}); };
if (my $err = $@) {
$self->log('err', $err);
$self->{errors} = 1;
}
}
} }
sub phase3 { sub phase3 {
@ -621,14 +637,6 @@ sub phase3_cleanup {
$self->{errors} = 1; $self->{errors} = 1;
} }
if ($self->{tunnel}) {
eval { finish_tunnel($self, $self->{tunnel}); };
if (my $err = $@) {
$self->log('err', $err);
$self->{errors} = 1;
}
}
# always deactivate volumes - avoid lvm LVs to be active on several nodes # always deactivate volumes - avoid lvm LVs to be active on several nodes
eval { eval {
my $vollist = PVE::QemuServer::get_vm_volumes($conf); my $vollist = PVE::QemuServer::get_vm_volumes($conf);