OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Changed the last-mode to none of first start COLO

Browse Source 
When we first stated the COLO, the last-mode is as follows:
{ "execute": "query-colo-status" }
{"return": {"last-mode": "primary", "mode": "primary", "reason": "none"}}

The last-mode is unreasonable. After the patch, will be changed to the
following:
{ "execute": "query-colo-status" }
{"return": {"last-mode": "none", "mode": "primary", "reason": "none"}}

Signed-off-by: Lei Rao <lei.rao@intel.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Rao, Lei 2021-11-01 15:57:04 +08:00 committed by Juan Quintela
parent 04dd89169b
commit 2b9f6bf36c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
migration/colo.c
View File

@ -205,7 +205,7 @@ void colo_do_failover(void)
vm_stop_force_state(RUN_STATE_COLO); vm_stop_force_state(RUN_STATE_COLO);
} }
switch (get_colo_mode()) { switch (last_colo_mode = get_colo_mode()) {
case COLO_MODE_PRIMARY: case COLO_MODE_PRIMARY:
primary_vm_do_failover(); primary_vm_do_failover();
break; break;
@ -530,8 +530,7 @@ static void colo_process_checkpoint(MigrationState *s)
Error *local_err = NULL; Error *local_err = NULL;
int ret; int ret;
last_colo_mode = get_colo_mode(); if (get_colo_mode() != COLO_MODE_PRIMARY) {
if (last_colo_mode != COLO_MODE_PRIMARY) {
error_report("COLO mode must be COLO_MODE_PRIMARY"); error_report("COLO mode must be COLO_MODE_PRIMARY");
return; return;
} }
@ -830,8 +829,7 @@ void *colo_process_incoming_thread(void *opaque)
migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE, migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE,
MIGRATION_STATUS_COLO); MIGRATION_STATUS_COLO);
last_colo_mode = get_colo_mode(); if (get_colo_mode() != COLO_MODE_SECONDARY) {
if (last_colo_mode != COLO_MODE_SECONDARY) {
error_report("COLO mode must be COLO_MODE_SECONDARY"); error_report("COLO mode must be COLO_MODE_SECONDARY");
return NULL; return NULL;
} }