From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZX3LQ-00064m-QL for qemu-devel@nongnu.org; Wed, 02 Sep 2015 04:24:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZX3LP-000186-Bc for qemu-devel@nongnu.org; Wed, 02 Sep 2015 04:24:36 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:28400) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZX3LO-00017R-Je for qemu-devel@nongnu.org; Wed, 02 Sep 2015 04:24:35 -0400 From: zhanghailiang Date: Wed, 2 Sep 2015 16:23:09 +0800 Message-ID: <1441182199-8328-23-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1441182199-8328-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1441182199-8328-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH COLO-Frame v9 22/32] qmp event: Add event notification for COLO error List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lizhijian@cn.fujitsu.com, quintela@redhat.com, Markus Armbruster , yunhong.jiang@intel.com, eddie.dong@intel.com, peter.huangpeng@huawei.com, dgilbert@redhat.com, arei.gonglei@huawei.com, stefanha@redhat.com, amit.shah@redhat.com, yanghy@cn.fujitsu.com, Michael Roth , zhanghailiang If some errors happen during VM's COLO FT stage, it's important to notify the users of this event. Together with 'colo_lost_heartbeat', users can intervene in COLO's failover work immediately. If users don't want to get involved in COLO's failover verdict, it is still necessary to notify users that we exit COLO mode. Cc: Markus Armbruster Cc: Michael Roth Signed-off-by: zhanghailiang Signed-off-by: Li Zhijian --- docs/qmp/qmp-events.txt | 17 +++++++++++++++++ migration/colo.c | 17 +++++++++++++---- qapi-schema.json | 16 ++++++++++++++++ qapi/event.json | 17 +++++++++++++++++ 4 files changed, 63 insertions(+), 4 deletions(-) diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt index d92cc48..0bd7c41 100644 --- a/docs/qmp/qmp-events.txt +++ b/docs/qmp/qmp-events.txt @@ -182,6 +182,23 @@ Example: Note: The "ready to complete" status is always reset by a BLOCK_JOB_ERROR event. +COLO_EXIT +--------- + +Emitted when VM finishes COLO mode due to some errors happening or +the request of users. + +Data: + + - "mode": COLO mode, primary or secondary side (json-string) + - "reason": the exit reason, internal error or external request. (json-string) + - "error": error message (json-string, operation) + +Example: + +{"timestamp": {"seconds": 2032141960, "microseconds": 417172}, + "event": "COLO_EXIT", "data": {"mode": "primary", "reason": "request" } } + DEVICE_DELETED -------------- diff --git a/migration/colo.c b/migration/colo.c index 9ad285c..29b5334 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -18,6 +18,7 @@ #include "qemu/error-report.h" #include "qemu/sockets.h" #include "migration/failover.h" +#include "qapi-event.h" /* * checkpoint interval: unit ms @@ -347,6 +348,9 @@ out: current_time = error_time = qemu_clock_get_ms(QEMU_CLOCK_HOST); if (ret < 0) { error_report("Detect some error: %s", strerror(-ret)); + qapi_event_send_colo_exit(COLO_MODE_PRIMARY, COLO_EXIT_REASON_ERROR, + true, strerror(-ret), NULL); + /* Give users time to get involved in this verdict */ while (current_time - error_time <= DEFAULT_FAILOVER_DELAY) { if (failover_request_is_active()) { @@ -363,15 +367,14 @@ out: failover_request_active(NULL); } qemu_mutex_unlock_iothread(); + } else { + qapi_event_send_colo_exit(COLO_MODE_PRIMARY, COLO_EXIT_REASON_REQUEST, + false, NULL, NULL); } qsb_free(buffer); buffer = NULL; - if (s->from_dst_file) { - qemu_fclose(s->from_dst_file); - } - return NULL; } @@ -552,6 +555,9 @@ out: if (ret < 0) { error_report("colo incoming thread will exit, detect error: %s", strerror(-ret)); + qapi_event_send_colo_exit(COLO_MODE_SECONDARY, COLO_EXIT_REASON_ERROR, + true, strerror(-ret), NULL); + /* Give users time to get involved in this verdict */ while (current_time - error_time <= DEFAULT_FAILOVER_DELAY) { if (failover_request_is_active()) { @@ -570,6 +576,9 @@ out: error_report("SVM is going to exit in default!"); exit(1); } + } else { + qapi_event_send_colo_exit(COLO_MODE_SECONDARY, COLO_EXIT_REASON_REQUEST, + false, NULL, NULL); } if (fb) { diff --git a/qapi-schema.json b/qapi-schema.json index 8468552..f75e96b 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -712,6 +712,22 @@ 'data': [ 'unknown', 'primary', 'secondary'] } ## +# @COLOExitReason +# +# The reason of COLO exit +# +# @unknow: unknown reason +# +# @request: COLO exit is due to an external request +# +# @error: COLO exit is due to an internal error +# +# Since: 2.5 +## +{ 'enum': 'COLOExitReason', + 'data': [ 'unknown', 'request', 'error'] } + +## # @colo-lost-heartbeat # # Tell qemu that heartbeat is lost, request it to do takeover procedures. diff --git a/qapi/event.json b/qapi/event.json index f0cef01..6158ab5 100644 --- a/qapi/event.json +++ b/qapi/event.json @@ -255,6 +255,23 @@ 'data': {'status': 'MigrationStatus'}} ## +# @COLO_EXIT +# +# Emitted when VM finishes COLO mode due to some errors happening or +# the request of users. +# +# @mode: @COLOMode describing which side of VM is exit. +# +# @reason: @COLOExitReason describing the reason of colo exit. +# +# @error: #optional, error message. Only present on error happening. +# +# Since: 2.5 +## +{ 'event': 'COLO_EXIT', + 'data': {'mode': 'COLOMode', 'reason': 'COLOExitReason', '*error': 'str' } } + +## # @ACPI_DEVICE_OST # # Emitted when guest executes ACPI _OST method. -- 1.8.3.1