[pve-devel] applied: [PATCH] migration : enable mtunnel for insecure migration V2

[Wolfgang Bumiller]

thanks, applied

In the future please put the version tag into the brackets so that
`git am` doesn't include it as part of the commit message
("[PATCH v2] message..."), like Thomas already mentioned.

On Tue, Sep 05, 2017 at 11:46:17AM +0200, Alexandre Derumier wrote:
> We only use it to send commands faster like resume
> 
> Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
> ---
>  PVE/QemuMigrate.pm | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
> index fc847cc..5e18520 100644
> --- a/PVE/QemuMigrate.pm
> +++ b/PVE/QemuMigrate.pm
> @@ -601,8 +601,9 @@ sub phase2 {
>  
>      die "unable to detect remote migration address\n" if !$raddr;
>  
> +    $self->log('info', "start remote tunnel");
> +
>      if ($migration_type eq 'secure') {
> -	$self->log('info', "start remote tunnel");
>  
>  	if ($ruri =~ /^unix:/) {
>  	    unlink $raddr;
> @@ -635,6 +636,9 @@ sub phase2 {
>  	} else {
>  	    die "unsupported protocol in migration URI: $ruri\n";
>  	}
> +    } else {
> +	#fork tunnel for insecure migration, to send faster commands like resume
> +	$self->{tunnel} = $self->fork_tunnel();
>      }
>  
>      my $start = time();
> -- 
> 2.11.0