|
 |
05bba0 |
From 8f6bbf90e819d271a62f2b59732d188b51a96128 Mon Sep 17 00:00:00 2001
|
|
|
05bba0 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
05bba0 |
Date: Fri, 16 Jan 2015 17:35:37 +0100
|
|
|
05bba0 |
Subject: [PATCH 05/16] migration_cancel: shutdown migration socket
|
|
|
05bba0 |
|
|
|
05bba0 |
Message-id: <1421429737-23581-4-git-send-email-dgilbert@redhat.com>
|
|
|
05bba0 |
Patchwork-id: 63334
|
|
|
05bba0 |
O-Subject: [RHEL-7.2 qemu-kvm PATCH 3/3] migration_cancel: shutdown migration socket
|
|
|
05bba0 |
Bugzilla: 1086168
|
|
|
05bba0 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
05bba0 |
RH-Acked-by: Amit Shah <amit.shah@redhat.com>
|
|
|
05bba0 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
05bba0 |
|
|
|
05bba0 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
05bba0 |
|
|
|
05bba0 |
Force shutdown on migration socket on cancel to cause the cancel
|
|
|
05bba0 |
to complete even if the socket is blocked on a dead network.
|
|
|
05bba0 |
|
|
|
05bba0 |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
05bba0 |
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
05bba0 |
Reviewed-by: Amit Shah <amit.shah@redhat.com>
|
|
|
05bba0 |
Signed-off-by: Amit Shah <amit.shah@redhat.com>
|
|
|
05bba0 |
(cherry picked from commit a26ba26e214911dc879a23e797d2c269cdb38577)
|
|
|
05bba0 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
05bba0 |
|
|
|
05bba0 |
Conflicts:
|
|
|
05bba0 |
migration.c
|
|
|
05bba0 |
---
|
|
|
05bba0 |
migration.c | 12 ++++++++++++
|
|
|
05bba0 |
1 file changed, 12 insertions(+)
|
|
|
05bba0 |
|
|
|
05bba0 |
diff --git a/migration.c b/migration.c
|
|
|
05bba0 |
index 44b993a..e8c5939 100644
|
|
|
05bba0 |
--- a/migration.c
|
|
|
05bba0 |
+++ b/migration.c
|
|
|
05bba0 |
@@ -331,6 +331,7 @@ void migrate_fd_error(MigrationState *s)
|
|
|
05bba0 |
static void migrate_fd_cancel(MigrationState *s)
|
|
|
05bba0 |
{
|
|
|
05bba0 |
int old_state ;
|
|
|
05bba0 |
+ QEMUFile *f = migrate_get_current()->file;
|
|
|
05bba0 |
DPRINTF("cancelling migration\n");
|
|
|
05bba0 |
|
|
|
05bba0 |
do {
|
|
|
05bba0 |
@@ -340,6 +341,17 @@ static void migrate_fd_cancel(MigrationState *s)
|
|
|
05bba0 |
}
|
|
|
05bba0 |
migrate_set_state(s, old_state, MIG_STATE_CANCELLING);
|
|
|
05bba0 |
} while (s->state != MIG_STATE_CANCELLING);
|
|
|
05bba0 |
+
|
|
|
05bba0 |
+ /*
|
|
|
05bba0 |
+ * If we're unlucky the migration code might be stuck somewhere in a
|
|
|
05bba0 |
+ * send/write while the network has failed and is waiting to timeout;
|
|
|
05bba0 |
+ * if we've got shutdown(2) available then we can force it to quit.
|
|
|
05bba0 |
+ * The outgoing qemu file gets closed in migrate_fd_cleanup that is
|
|
|
05bba0 |
+ * called in a bh, so there is no race against this cancel.
|
|
|
05bba0 |
+ */
|
|
|
05bba0 |
+ if (s->state == MIG_STATE_CANCELLING && f) {
|
|
|
05bba0 |
+ qemu_file_shutdown(f);
|
|
|
05bba0 |
+ }
|
|
|
05bba0 |
}
|
|
|
05bba0 |
|
|
|
05bba0 |
void add_migration_state_change_notifier(Notifier *notify)
|
|
|
05bba0 |
--
|
|
|
05bba0 |
1.8.3.1
|
|
|
05bba0 |
|