[pve-devel] [PATCH v3 2/3] migrate: use ssh over socat provided UNIX socks as tunnel
Thomas Lamprecht
t.lamprecht at proxmox.com
Wed Jun 1 12:09:40 CEST 2016
We cannot guarantee when the SSH forward Tunnel really becomes
ready. The check with the mtunnel API call did not help for this
prolem as it only checked that the SSH connection itself works and
that the destination node has quorum but the forwarded tunnel itself
was not checked.
The Forward tunnel is a different channel in the SSH connection,
independent of the SSH `qm mtunnel` channel, so only if that works
it does not guarantees that our migration tunnel is up and ready.
When the node(s) where under load, or when we did parallel
migrations (migrateall), the migrate command was often started
before a tunnel was open and ready to receive data. This led to
a direct abortion of the migration and is the main cause in why
parallel migrations often leave two thirds or more VMs on the
source node.
The issue was tracked down to SSH after debugging the QEMU
process and enabling debug logging showed that the tunnel became
often to late available and ready, or not at all.
Fixing the TCP forward tunnel is quirky and not straight ahead, the
only way SSH gives as a possibility is to use -N (no command)
-f (background) and -o "ExitOnForwardFailure=yes", then it would
wait in the foreground until the tunnel is ready and only then
background itself. This is not quite the nicest way for our special
use case and our code base.
Waiting for the local port to become open and ready (through
/proc/net/tcp[6]] as a proof of concept is not enough, even if the
port is in the listening state and should theoretically accept
connections this still failed often as the tunnel was not yet fully
ready.
Further another problem would still be open if we tried to patch the
SSH Forward method we currently use - which we solve for free with
the approach of this patch - namely the problem that the method
to get an available port (next_migration_port) has a serious race
condition which could lead to multiple use of the same port on a
parallel migration (I observed this on my many test, seldom but if
it happens its really bad).
So lets now use UNIX sockets, which ssh supports since version 5.7.
The end points are UNIX socket bound to the VMID - thus no port so
no race and also no limitation of available ports (we reserved 50 for
migration).
The endpoints get created in /run/qemu-server/VMID.migrate and as
KVM/QEMU is able to use UNIX socket just as well as TCP we have not
to change much on the interaction with QEMU.
QEMU is started with the migrate_incoming url at the local
destination endpoint and creates the socket file, we then create
a listening socket on the source side and connect over SSH to the
destination.
Now the migration can be started by issuing the migrate qmp command
with an updated uri.
Another small issue was that we used open2 to make the tunnel in a
child process but never collected it when we closed tunnel, fix that.
Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
---
PVE/QemuMigrate.pm | 79 +++++++++++++++++++++++++++++++++++++-----------------
PVE/QemuServer.pm | 22 +++++++++------
2 files changed, 68 insertions(+), 33 deletions(-)
diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index bfa2277..de6b13d 100644
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -73,11 +73,11 @@ sub finish_command_pipe {
}
sub fork_tunnel {
- my ($self, $nodeip, $lport, $rport) = @_;
+ my ($self, $sock_addr) = @_;
- my @localtunnelinfo = $lport ? ('-L' , "$lport:localhost:$rport" ) : ();
+ my @localtunnelinfo = ('-L' , "$sock_addr:$sock_addr" );
- my $cmd = [@{$self->{rem_ssh}}, @localtunnelinfo, 'qm', 'mtunnel' ];
+ my $cmd = [@{$self->{rem_ssh}}, '-o ExitOnForwardFailure=yes', @localtunnelinfo, 'qm', 'mtunnel' ];
my $tunnel = $self->fork_command_pipe($cmd);
@@ -97,12 +97,16 @@ sub fork_tunnel {
$self->finish_command_pipe($tunnel);
die "can't open migration tunnel - $err";
}
+
+ $tunnel->{sock_addr} = $sock_addr;
+
return $tunnel;
}
sub finish_tunnel {
- my ($self, $tunnel) = @_;
+ my ($self) = @_;
+ my $tunnel = $self->{tunnel};
my $writer = $tunnel->{writer};
eval {
@@ -115,7 +119,18 @@ sub finish_tunnel {
$self->finish_command_pipe($tunnel);
- die $err if $err;
+ # ssh does not clean up on local host
+ my $cmd = ['rm', '-f', $tunnel->{sock_addr}]; #
+ PVE::Tools::run_command($cmd);
+
+ # .. and just to be sure check on remote side
+ unshift @{$cmd}, @{$self->{rem_ssh}};
+ PVE::Tools::run_command($cmd);
+
+ if ($err) {
+ $self->log('err', $err);
+ $self->{errors} = 1;
+ }
}
sub lock_vm {
@@ -329,6 +344,7 @@ sub phase2 {
my $raddr;
my $rport;
+ my $ruri; # the whole migration dst. URI (protocol:address[:port])
my $nodename = PVE::INotify::nodename();
## start on remote node
@@ -352,14 +368,22 @@ sub phase2 {
# instead we pipe it through STDIN
PVE::Tools::run_command($cmd, input => $spice_ticket, outfunc => sub {
my $line = shift;
+ $self->log('info', $line);
if ($line =~ m/^migration listens on tcp:(localhost|[\d\.]+|\[[\d\.:a-fA-F]+\]):(\d+)$/) {
$raddr = $1;
$rport = int($2);
+ $ruri = "tcp:$raddr:$rport";
+ }
+ elsif ($line =~ m!^migration listens on unix:(/run/qemu-server/(\d+)\.migrate)$!) {
+ $raddr = $1;
+ die "Destination UNIX sockets VMID does not match source VMID" if $vmid ne $2;
+ $ruri = "unix:$raddr";
}
elsif ($line =~ m/^migration listens on port (\d+)$/) {
$raddr = "localhost";
$rport = int($1);
+ $ruri = "tcp:$raddr:$rport";
}
elsif ($line =~ m/^spice listens on port (\d+)$/) {
$spice_port = int($1);
@@ -371,14 +395,26 @@ sub phase2 {
die "unable to detect remote migration address\n" if !$raddr;
- ## create tunnel to remote port
- $self->log('info', "starting ssh migration tunnel");
- my $pfamily = PVE::Tools::get_host_address_family($nodename);
- my $lport = ($raddr eq "localhost") ? PVE::Tools::next_migrate_port($pfamily) : undef;
- $self->{tunnel} = $self->fork_tunnel($self->{nodeip}, $lport, $rport);
+ if ($ruri =~ /^unix:/) {
+ ## create tunnel to remote port
+ $self->log('info', "start remote tunnel");
+ $self->{tunnel} = $self->fork_tunnel($raddr);
+
+ my $unix_socket_try = 0; # wait for the socket to become ready
+ while (! -S $raddr) {
+ $unix_socket_try++;
+ if ($unix_socket_try > 100) {
+ $self->{errors} = 1;
+ $self->finish_tunnel();
+ die "Timeout, migration socket $ruri did not get ready";
+ }
+
+ usleep(50000);
+ }
+ }
my $start = time();
- $self->log('info', "starting online/live migration on $raddr:$rport");
+ $self->log('info', "starting online/live migration on $ruri");
$self->{livemigration} = 1;
# load_defaults
@@ -437,10 +473,10 @@ sub phase2 {
}
eval {
- PVE::QemuServer::vm_mon_cmd_nocheck($vmid, "migrate", uri => "tcp:$raddr:$rport");
+ PVE::QemuServer::vm_mon_cmd_nocheck($vmid, "migrate", uri => $ruri);
};
my $merr = $@;
- $self->log('info', "migrate uri => tcp:$raddr:$rport failed: $merr") if $merr;
+ $self->log('info', "migrate uri => $ruri failed: $merr") if $merr;
my $lstat = 0;
my $usleep = 2000000;
@@ -537,13 +573,10 @@ 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;
- }
+
+ # just to be sure that the tunnel gets closed on no error
+ if (!$self->{errors} && $self->{tunnel}) {
+ finish_tunnel($self);
}
}
@@ -579,11 +612,7 @@ sub phase2_cleanup {
}
if ($self->{tunnel}) {
- eval { finish_tunnel($self, $self->{tunnel}); };
- if (my $err = $@) {
- $self->log('err', $err);
- $self->{errors} = 1;
- }
+ finish_tunnel($self);
}
}
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 2da9208..e959b8a 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -4299,21 +4299,27 @@ sub vm_start {
my ($cmd, $vollist, $spice_port) = config_to_command($storecfg, $vmid, $conf, $defaults, $forcemachine);
- my $migrate_port = 0;
my $migrate_uri;
if ($statefile) {
if ($statefile eq 'tcp') {
- my $localip = "localhost";
+ # default to secure migrations: use ssh over a socat managed UNIX socket
+ # pair, as we a ssh forwards tunnel is not deterministic reliable ready
+ $migrate_uri = "unix:/run/qemu-server/$vmid.migrate";
+
my $datacenterconf = PVE::Cluster::cfs_read_file('datacenter.cfg');
- my $nodename = PVE::INotify::nodename();
if ($datacenterconf->{migration_unsecure}) {
- $localip = PVE::Cluster::remote_node_ip($nodename, 1);
- $localip = "[$localip]" if Net::IP::ip_is_ipv6($localip);
+ my $nodename = PVE::INotify::nodename();
+ my $localip = PVE::Cluster::remote_node_ip($nodename, 1);
+ $localip = "[$localip]" if Net::IP::ip_is_ipv6($localip);
+
+ my $pfamily = PVE::Tools::get_host_address_family($nodename);
+ my $migrate_port = PVE::Tools::next_migrate_port($pfamily) || 0;
+
+ $migrate_uri = "tcp:${localip}:${migrate_port}";
}
- my $pfamily = PVE::Tools::get_host_address_family($nodename);
- $migrate_port = PVE::Tools::next_migrate_port($pfamily);
- $migrate_uri = "tcp:${localip}:${migrate_port}";
+
push @$cmd, '-incoming', $migrate_uri;
+
push @$cmd, '-S';
} else {
push @$cmd, '-loadstate', $statefile;
--
2.1.4
More information about the pve-devel
mailing list