From 386c6ba7f5dc7de2a6e48d0520cda72f4b2a8bf3 Mon Sep 17 00:00:00 2001
From: Wolfgang Link <w.link@proxmox.com>
Date: Tue, 2 Feb 2016 11:53:17 +0100
Subject: [PATCH] close tunnel after migration is finish.

if we do not close it, there is a change that the tunnel stays open and the next migration will not work.
---
 PVE/QemuMigrate.pm | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index 7ae3880a..5da62eb5 100644
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -520,6 +520,14 @@ sub phase2 {
 	    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 {
@@ -552,6 +560,14 @@ sub phase2_cleanup {
         $self->log('err', $err);
         $self->{errors} = 1;
     }
+
+    if ($self->{tunnel}) {
+	eval { finish_tunnel($self, $self->{tunnel});  };
+	if (my $err = $@) {
+	    $self->log('err', $err);
+	    $self->{errors} = 1;
+	}
+    }
 }
 
 sub phase3 {
@@ -621,14 +637,6 @@ sub phase3_cleanup {
 	$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
     eval {
 	my $vollist = PVE::QemuServer::get_vm_volumes($conf);