From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9B0C-00026G-UM for qemu-devel@nongnu.org; Thu, 08 Jan 2015 06:11:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y9B08-0008FD-Ix for qemu-devel@nongnu.org; Thu, 08 Jan 2015 06:11:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53345) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9B08-0008F5-Ay for qemu-devel@nongnu.org; Thu, 08 Jan 2015 06:11:40 -0500 From: "Dr. David Alan Gilbert (git)" Date: Thu, 8 Jan 2015 11:11:29 +0000 Message-Id: <1420715492-5109-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH 0/3] Migration cancel with dead network List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com, cristian.klein@cs.umu.se, quintela@redhat.com From: "Dr. David Alan Gilbert" If the remote host, or networking dies during a migration, the socket can be waiting for a long timeout, and migration_cancel can't complete the cancel for a long time (and you can't start a new one to somewhere else). (Where 'long' is the TCP timeout, that's ~15 mins) This patch set uses the shutdown(2) syscall to unblock any write/sends that are in progress to let the migrate_cancel happen quickly. 1/3: socket shutdown - An updated patch from my postcopy world to add a shut_down method on QEMUFile - only for 'socket' (where the syscall is supported). 2/3: Handle bi-directional communication for fd migration - A patch from Cristian Klein to use the socket QEMUFile for FDs that are passed in, if the FDs are sockets; this is needed so that libvirt migrations can take advantage of the other patches. Again this patch (and its naming) come from the postcopy world. 3/3: migration_cancel: shutdown migration socket - A new patch that uses the shutdown in migrate_fd_cancel Note this does not fix the timeout if you try to migrate to an already dead host; the connect timeout is typically a much shorter 2 minutes anyway. Dave Cristian Klein (1): Handle bi-directional communication for fd migration Dr. David Alan Gilbert (2): socket shutdown migration_cancel: shutdown migration socket include/migration/qemu-file.h | 10 ++++++++++ include/qemu/sockets.h | 7 +++++++ migration/fd.c | 24 ++++++++++++++++++++++-- migration/migration.c | 12 ++++++++++++ migration/qemu-file-unix.c | 23 +++++++++++++++++++---- migration/qemu-file.c | 12 ++++++++++++ 6 files changed, 82 insertions(+), 6 deletions(-) -- 2.1.0