[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH COLO-Frame v19 15/22] COLO: Implement failover work
From: |
zhanghailiang |
Subject: |
[Qemu-devel] [PATCH COLO-Frame v19 15/22] COLO: Implement failover work for secondary VM |
Date: |
Thu, 1 Sep 2016 11:24:18 +0800 |
If users require SVM to takeover work, COLO incoming thread should
exit from loop while failover BH helps backing to migration incoming
coroutine.
Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Li Zhijian <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
---
v12:
- Improve error message that suggested by Dave
- Add Reviewed-by tag
---
migration/colo.c | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/migration/colo.c b/migration/colo.c
index 8d6f585..f1fb2ef 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -46,6 +46,33 @@ static bool colo_runstate_is_stopped(void)
return runstate_check(RUN_STATE_COLO) || !runstate_is_running();
}
+static void secondary_vm_do_failover(void)
+{
+ int old_state;
+ MigrationIncomingState *mis = migration_incoming_get_current();
+
+ migrate_set_state(&mis->state, MIGRATION_STATUS_COLO,
+ MIGRATION_STATUS_COMPLETED);
+
+ if (!autostart) {
+ error_report("\"-S\" qemu option will be ignored in secondary side");
+ /* recover runstate to normal migration finish state */
+ autostart = true;
+ }
+
+ old_state = failover_set_state(FAILOVER_STATUS_HANDLING,
+ FAILOVER_STATUS_COMPLETED);
+ if (old_state != FAILOVER_STATUS_HANDLING) {
+ error_report("Incorrect state (%d) while doing failover for "
+ "secondary VM", old_state);
+ return;
+ }
+ /* For Secondary VM, jump to incoming co */
+ if (mis->migration_incoming_co) {
+ qemu_coroutine_enter(mis->migration_incoming_co);
+ }
+}
+
static void primary_vm_do_failover(void)
{
MigrationState *s = migrate_get_current();
@@ -72,6 +99,8 @@ void colo_do_failover(MigrationState *s)
if (get_colo_mode() == COLO_MODE_PRIMARY) {
primary_vm_do_failover();
+ } else {
+ secondary_vm_do_failover();
}
}
@@ -414,6 +443,11 @@ void *colo_process_incoming_thread(void *opaque)
goto out;
}
assert(request);
+ if (failover_request_is_active()) {
+ error_report("failover request");
+ goto out;
+ }
+
/* FIXME: This is unnecessary for periodic checkpoint mode */
colo_send_message(mis->to_src_file, COLO_MESSAGE_CHECKPOINT_REPLY,
&local_err);
--
1.8.3.1
- [Qemu-devel] [PATCH COLO-Frame v19 02/22] COLO: migrate COLO related info to secondary node, (continued)
- [Qemu-devel] [PATCH COLO-Frame v19 02/22] COLO: migrate COLO related info to secondary node, zhanghailiang, 2016/08/31
- [Qemu-devel] [PATCH COLO-Frame v19 05/22] COLO: Establish a new communicating path for COLO, zhanghailiang, 2016/08/31
- [Qemu-devel] [PATCH COLO-Frame v19 04/22] migration: Switch to COLO process after finishing loadvm, zhanghailiang, 2016/08/31
- [Qemu-devel] [PATCH COLO-Frame v19 07/22] COLO: Add a new RunState RUN_STATE_COLO, zhanghailiang, 2016/08/31
- [Qemu-devel] [PATCH COLO-Frame v19 14/22] COLO: Implement the process of failover for primary VM, zhanghailiang, 2016/08/31
- [Qemu-devel] [PATCH COLO-Frame v19 13/22] COLO: Introduce state to record failover process, zhanghailiang, 2016/08/31
- [Qemu-devel] [PATCH COLO-Frame v19 10/22] COLO: Add checkpoint-delay parameter for migrate-set-parameters, zhanghailiang, 2016/08/31
- [Qemu-devel] [PATCH COLO-Frame v19 12/22] COLO: Add 'x-colo-lost-heartbeat' command to trigger failover, zhanghailiang, 2016/08/31
- [Qemu-devel] [PATCH COLO-Frame v19 19/22] COLO: Update the global runstate after going into colo state, zhanghailiang, 2016/08/31
- [Qemu-devel] [PATCH COLO-Frame v19 18/22] COLO: Handle shutdown command for VM in COLO state, zhanghailiang, 2016/08/31
- [Qemu-devel] [PATCH COLO-Frame v19 15/22] COLO: Implement failover work for secondary VM,
zhanghailiang <=
- [Qemu-devel] [PATCH COLO-Frame v19 22/22] configure: Support enable/disable COLO feature, zhanghailiang, 2016/08/31
- [Qemu-devel] [PATCH COLO-Frame v19 21/22] docs: Add documentation for COLO feature, zhanghailiang, 2016/08/31
- [Qemu-devel] [PATCH COLO-Frame v19 16/22] COLO: Shutdown related socket fd while do failover, zhanghailiang, 2016/08/31
- [Qemu-devel] [PATCH COLO-Frame v19 17/22] COLO: Don't do failover while loading VM's state, zhanghailiang, 2016/08/31
- [Qemu-devel] [PATCH COLO-Frame v19 20/22] COLO: Add block replication into colo process, zhanghailiang, 2016/08/31
- [Qemu-devel] [PATCH COLO-Frame v19 06/22] COLO: Introduce checkpointing protocol, zhanghailiang, 2016/08/31
- [Qemu-devel] [PATCH COLO-Frame v19 11/22] COLO: Synchronize PVM's state to SVM periodically, zhanghailiang, 2016/08/31
- [Qemu-devel] [PATCH COLO-Frame v19 08/22] COLO: Send PVM state to secondary side when do checkpoint, zhanghailiang, 2016/08/31
- [Qemu-devel] [PATCH COLO-Frame v19 01/22] migration: Introduce capability 'x-colo' to migration, zhanghailiang, 2016/08/31
- [Qemu-devel] [PATCH COLO-Frame v19 03/22] migration: Enter into COLO mode after migration if COLO is enabled, zhanghailiang, 2016/08/31