ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migration/colo.c: Make user obtain the last COLO mode info after failover 

Add the last_colo_mode to save the status after failover.
This patch can solve the issue that user want to get last colo mode
use query_colo_status after failover.

Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Zhang Chen 2019-03-22 18:13:33 +08:00 committed by Juan Quintela
parent 82cd368ccd
commit 5ed0deca41
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
migration/colo.c
View File

@ -38,6 +38,9 @@
static bool vmstate_loading; static bool vmstate_loading;
static Notifier packets_compare_notifier; static Notifier packets_compare_notifier;
/* User need to know colo mode after COLO failover */
static COLOMode last_colo_mode;
#define COLO_BUFFER_BASE_SIZE (4 * 1024 * 1024) #define COLO_BUFFER_BASE_SIZE (4 * 1024 * 1024)
bool migration_in_colo_state(void) bool migration_in_colo_state(void)
@ -264,6 +267,7 @@ COLOStatus *qmp_query_colo_status(Error **errp)
COLOStatus *s = g_new0(COLOStatus, 1); COLOStatus *s = g_new0(COLOStatus, 1);
s->mode = get_colo_mode(); s->mode = get_colo_mode();
s->last_mode = last_colo_mode;
switch (failover_get_state()) { switch (failover_get_state()) {
case FAILOVER_STATUS_NONE: case FAILOVER_STATUS_NONE:
@ -515,6 +519,12 @@ 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 (last_colo_mode != COLO_MODE_PRIMARY) {
error_report("COLO mode must be COLO_MODE_PRIMARY");
return;
}
failover_init_state(); failover_init_state();
s->rp_state.from_dst_file = qemu_file_get_return_path(s->to_dst_file); s->rp_state.from_dst_file = qemu_file_get_return_path(s->to_dst_file);
@ -688,6 +698,12 @@ 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 (last_colo_mode != COLO_MODE_SECONDARY) {
error_report("COLO mode must be COLO_MODE_SECONDARY");
return NULL;
}
failover_init_state(); failover_init_state();
mis->to_src_file = qemu_file_get_return_path(mis->from_src_file); mis->to_src_file = qemu_file_get_return_path(mis->from_src_file);

7
qapi/migration.json
View File

@ -1380,12 +1380,17 @@
# @mode: COLO running mode. If COLO is running, this field will return # @mode: COLO running mode. If COLO is running, this field will return
# 'primary' or 'secondary'. # 'primary' or 'secondary'.
# #
# @last_mode: COLO last running mode. If COLO is running, this field
# will return same like mode field, after failover we can
# use this field to get last colo mode. (since 4.1)
#
# @reason: describes the reason for the COLO exit. # @reason: describes the reason for the COLO exit.
# #
# Since: 3.1 # Since: 3.1
## ##
{ 'struct': 'COLOStatus', { 'struct': 'COLOStatus',
'data': { 'mode': 'COLOMode', 'reason': 'COLOExitReason' } } 'data': { 'mode': 'COLOMode', 'last_mode': 'COLOMode',
'reason': 'COLOExitReason' } }
## ##
# @query-colo-status: # @query-colo-status: