[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/3] migration_cancel: shutdown migration socket
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PATCH 3/3] migration_cancel: shutdown migration socket |
Date: |
Thu, 8 Jan 2015 11:11:32 +0000 |
From: "Dr. David Alan Gilbert" <address@hidden>
Force shutdown on migration socket on cancel to cause the cancel
to complete even if the socket is blocked on a dead network.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/migration.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/migration/migration.c b/migration/migration.c
index c49a05a..b3adbc6 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -330,6 +330,7 @@ void migrate_fd_error(MigrationState *s)
static void migrate_fd_cancel(MigrationState *s)
{
int old_state ;
+ QEMUFile *f = migrate_get_current()->file;
trace_migrate_fd_cancel();
do {
@@ -339,6 +340,17 @@ static void migrate_fd_cancel(MigrationState *s)
}
migrate_set_state(s, old_state, MIG_STATE_CANCELLING);
} while (s->state != MIG_STATE_CANCELLING);
+
+ /*
+ * If we're unlucky the migration code might be stuck somewhere in a
+ * send/write while the network has failed and is waiting to timeout;
+ * if we've got shutdown(2) available then we can force it to quit.
+ * The outgoing qemu file gets closed in migrate_fd_cleanup that is
+ * called in a bh, so there is no race against this cancel.
+ */
+ if (s->state == MIG_STATE_CANCELLING && f) {
+ qemu_file_shutdown(f);
+ }
}
void add_migration_state_change_notifier(Notifier *notify)
--
2.1.0
- [Qemu-devel] [PATCH 0/3] Migration cancel with dead network, Dr. David Alan Gilbert (git), 2015/01/08
- [Qemu-devel] [PATCH 2/3] Handle bi-directional communication for fd migration, Dr. David Alan Gilbert (git), 2015/01/08
- [Qemu-devel] [PATCH 1/3] socket shutdown, Dr. David Alan Gilbert (git), 2015/01/08
- [Qemu-devel] [PATCH 3/3] migration_cancel: shutdown migration socket,
Dr. David Alan Gilbert (git) <=
- Re: [Qemu-devel] [PATCH 0/3] Migration cancel with dead network, Daniel P. Berrange, 2015/01/08
- Re: [Qemu-devel] [PATCH 0/3] Migration cancel with dead network, Paolo Bonzini, 2015/01/08
- Re: [Qemu-devel] [PATCH 0/3] Migration cancel with dead network, Amit Shah, 2015/01/09