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

Migration/colo.c: Add new COLOExitReason to handle all failover state

Browse Source 
In this patch we add the processing state for COLOExitReason,
because we have to identify COLO in the failover processing state or
failover error state. In the way, we can handle all the failover state.
We have improved the description of the COLOExitReason by the way.

Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.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:31 +08:00 committed by Juan Quintela
parent 1fe6ab267f
commit 3a43ac4757
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
migration/colo.c
View File

@ -267,7 +267,11 @@ COLOStatus *qmp_query_colo_status(Error **errp)
s->reason = COLO_EXIT_REASON_REQUEST; s->reason = COLO_EXIT_REASON_REQUEST;
break; break;
default: default:
s->reason = COLO_EXIT_REASON_ERROR; if (migration_in_colo_state()) {
s->reason = COLO_EXIT_REASON_PROCESSING;
} else {
s->reason = COLO_EXIT_REASON_ERROR;
}
} }
return s; return s;
@ -579,16 +583,13 @@ out:
* or the user triggered failover. * or the user triggered failover.
*/ */
switch (failover_get_state()) { switch (failover_get_state()) {
case FAILOVER_STATUS_NONE:
qapi_event_send_colo_exit(COLO_MODE_PRIMARY,
COLO_EXIT_REASON_ERROR);
break;
case FAILOVER_STATUS_COMPLETED: case FAILOVER_STATUS_COMPLETED:
qapi_event_send_colo_exit(COLO_MODE_PRIMARY, qapi_event_send_colo_exit(COLO_MODE_PRIMARY,
COLO_EXIT_REASON_REQUEST); COLO_EXIT_REASON_REQUEST);
break; break;
default: default:
abort(); qapi_event_send_colo_exit(COLO_MODE_PRIMARY,
COLO_EXIT_REASON_ERROR);
} }
/* Hope this not to be too long to wait here */ /* Hope this not to be too long to wait here */
@ -850,17 +851,18 @@ out:
error_report_err(local_err); error_report_err(local_err);
} }
/*
* There are only two reasons we can get here, some error happened
* or the user triggered failover.
*/
switch (failover_get_state()) { switch (failover_get_state()) {
case FAILOVER_STATUS_NONE:
qapi_event_send_colo_exit(COLO_MODE_SECONDARY,
COLO_EXIT_REASON_ERROR);
break;
case FAILOVER_STATUS_COMPLETED: case FAILOVER_STATUS_COMPLETED:
qapi_event_send_colo_exit(COLO_MODE_SECONDARY, qapi_event_send_colo_exit(COLO_MODE_SECONDARY,
COLO_EXIT_REASON_REQUEST); COLO_EXIT_REASON_REQUEST);
break; break;
default: default:
abort(); qapi_event_send_colo_exit(COLO_MODE_SECONDARY,
COLO_EXIT_REASON_ERROR);
} }
if (fb) { if (fb) {

15
qapi/migration.json
View File

@ -1038,19 +1038,22 @@
## ##
# @COLOExitReason: # @COLOExitReason:
# #
# The reason for a COLO exit # The reason for a COLO exit.
# #
# @none: no failover has ever happened. This can't occur in the # @none: failover has never happened. This state does not occur
# COLO_EXIT event, only in the result of query-colo-status. # in the COLO_EXIT event, and is only visible in the result of
# query-colo-status.
# #
# @request: COLO exit is due to an external request # @request: COLO exit is due to an external request.
# #
# @error: COLO exit is due to an internal error # @error: COLO exit is due to an internal error.
#
# @processing: COLO is currently handling a failover (since 4.0).
# #
# Since: 3.1 # Since: 3.1
## ##
{ 'enum': 'COLOExitReason', { 'enum': 'COLOExitReason',
'data': [ 'none', 'request', 'error' ] } 'data': [ 'none', 'request', 'error' , 'processing' ] }
## ##
# @x-colo-lost-heartbeat: # @x-colo-lost-heartbeat: