[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 07/32] migration: allow src return path to pause
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v3 07/32] migration: allow src return path to pause |
Date: |
Mon, 16 Oct 2017 14:51:51 +0800 |
Let the thread pause for network issues.
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
migration/migration.c | 35 +++++++++++++++++++++++++++++++++--
migration/migration.h | 1 +
migration/trace-events | 2 ++
3 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 3cc6d4933d..17a8ec39ef 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1078,6 +1078,7 @@ static void migrate_fd_cleanup(void *opaque)
block_cleanup_parameters(s);
qemu_sem_destroy(&s->postcopy_pause_sem);
+ qemu_sem_destroy(&s->postcopy_pause_rp_sem);
}
void migrate_fd_error(MigrationState *s, const Error *error)
@@ -1222,6 +1223,7 @@ MigrationState *migrate_init(void)
error_free(s->error);
s->error = NULL;
qemu_sem_init(&s->postcopy_pause_sem, 0);
+ qemu_sem_init(&s->postcopy_pause_rp_sem, 0);
migrate_set_state(&s->state, MIGRATION_STATUS_NONE,
MIGRATION_STATUS_SETUP);
@@ -1641,6 +1643,18 @@ static void migrate_handle_rp_req_pages(MigrationState
*ms, const char* rbname,
}
}
+/* Return true to retry, false to quit */
+static bool postcopy_pause_return_path_thread(MigrationState *s)
+{
+ trace_postcopy_pause_return_path();
+
+ qemu_sem_wait(&s->postcopy_pause_rp_sem);
+
+ trace_postcopy_pause_return_path_continued();
+
+ return true;
+}
+
/*
* Handles messages sent on the return path towards the source VM
*
@@ -1657,6 +1671,8 @@ static void *source_return_path_thread(void *opaque)
int res;
trace_source_return_path_thread_entry();
+
+retry:
while (!ms->rp_state.error && !qemu_file_get_error(rp) &&
migration_is_setup_or_active(ms->state)) {
trace_source_return_path_thread_loop_top();
@@ -1748,13 +1764,28 @@ static void *source_return_path_thread(void *opaque)
break;
}
}
- if (qemu_file_get_error(rp)) {
+
+out:
+ res = qemu_file_get_error(rp);
+ if (res) {
+ if (res == -EIO) {
+ /*
+ * Maybe there is something we can do: it looks like a
+ * network down issue, and we pause for a recovery.
+ */
+ if (postcopy_pause_return_path_thread(ms)) {
+ /* Reload rp, reset the rest */
+ rp = ms->rp_state.from_dst_file;
+ ms->rp_state.error = false;
+ goto retry;
+ }
+ }
+
trace_source_return_path_thread_bad_end();
mark_source_rp_bad(ms);
}
trace_source_return_path_thread_end();
-out:
ms->rp_state.from_dst_file = NULL;
qemu_fclose(rp);
return NULL;
diff --git a/migration/migration.h b/migration/migration.h
index 1280060d54..6776405edb 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -156,6 +156,7 @@ struct MigrationState
/* Needed by postcopy-pause state */
QemuSemaphore postcopy_pause_sem;
+ QemuSemaphore postcopy_pause_rp_sem;
};
void migrate_set_state(int *state, int old_state, int new_state);
diff --git a/migration/trace-events b/migration/trace-events
index bed1646cd6..a4031cfe00 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -99,6 +99,8 @@ migration_thread_setup_complete(void) ""
open_return_path_on_source(void) ""
open_return_path_on_source_continue(void) ""
postcopy_start(void) ""
+postcopy_pause_return_path(void) ""
+postcopy_pause_return_path_continued(void) ""
postcopy_pause_continued(void) ""
postcopy_pause_incoming(void) ""
postcopy_pause_incoming_continued(void) ""
--
2.13.5
- [Qemu-devel] [PATCH v3 00/32] Migration: postcopy failure recovery, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 01/32] migration: better error handling with QEMUFile, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 02/32] migration: reuse mis->userfault_quit_fd, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 03/32] migration: provide postcopy_fault_thread_notify(), Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 04/32] migration: new postcopy-pause state, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 05/32] migration: implement "postcopy-pause" src logic, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 06/32] migration: allow dst vm pause on postcopy, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 07/32] migration: allow src return path to pause,
Peter Xu <=
- [Qemu-devel] [PATCH v3 08/32] migration: allow send_rq to fail, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 09/32] migration: allow fault thread to pause, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 10/32] qmp: hmp: add migrate "resume" option, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 11/32] migration: pass MigrationState to migrate_init(), Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 12/32] migration: rebuild channel on source, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 13/32] migration: new state "postcopy-recover", Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 14/32] migration: wakeup dst ram-load-thread for recover, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 15/32] migration: new cmd MIG_CMD_RECV_BITMAP, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 16/32] migration: new message MIG_RP_MSG_RECV_BITMAP, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 17/32] migration: new cmd MIG_CMD_POSTCOPY_RESUME, Peter Xu, 2017/10/16