From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a8kui-0003b5-2P for qemu-devel@nongnu.org; Tue, 15 Dec 2015 03:24:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a8kue-00010V-M9 for qemu-devel@nongnu.org; Tue, 15 Dec 2015 03:24:51 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:52388) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a8kue-00010I-2Z for qemu-devel@nongnu.org; Tue, 15 Dec 2015 03:24:48 -0500 From: zhanghailiang Date: Tue, 15 Dec 2015 16:22:46 +0800 Message-ID: <1450167779-9960-26-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1450167779-9960-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1450167779-9960-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH COLO-Frame v12 25/38] 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, zhanghailiang , arei.gonglei@huawei.com, stefanha@redhat.com, amit.shah@redhat.com, Michael Roth , hongyang.yang@easystack.cn 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 exited COLO mode. Cc: Markus Armbruster Cc: Michael Roth Signed-off-by: zhanghailiang Signed-off-by: Li Zhijian --- v11: - Fix several typos found by Eric Signed-off-by: zhanghailiang --- docs/qmp-events.txt | 17 +++++++++++++++++ migration/colo.c | 11 +++++++++++ qapi-schema.json | 16 ++++++++++++++++ qapi/event.json | 17 +++++++++++++++++ 4 files changed, 61 insertions(+) diff --git a/docs/qmp-events.txt b/docs/qmp-events.txt index d2f1ce4..19f68fc 100644 --- a/docs/qmp-events.txt +++ b/docs/qmp-events.txt @@ -184,6 +184,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 +at 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 d1dd4e1..d06c14f 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" /* colo buffer */ #define COLO_BUFFER_BASE_SIZE (4 * 1024 * 1024) @@ -349,6 +350,11 @@ static void colo_process_checkpoint(MigrationState *s) out: if (ret < 0) { error_report("%s: %s", __func__, strerror(-ret)); + qapi_event_send_colo_exit(COLO_MODE_PRIMARY, COLO_EXIT_REASON_ERROR, + true, strerror(-ret), NULL); + } else { + qapi_event_send_colo_exit(COLO_MODE_PRIMARY, COLO_EXIT_REASON_REQUEST, + false, NULL, NULL); } qsb_free(buffer); @@ -516,6 +522,11 @@ 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); + } 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 feb7d53..f6ecb88 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -778,6 +778,22 @@ 'data': [ 'unknown', 'primary', 'secondary'] } ## +# @COLOExitReason +# +# The reason for a COLO exit +# +# @unknown: unknown reason +# +# @request: COLO exit is due to an external request +# +# @error: COLO exit is due to an internal error +# +# Since: 2.6 +## +{ 'enum': 'COLOExitReason', + 'data': [ 'unknown', 'request', 'error'] } + +## # @x-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..f63d456 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 +# at the request of users. +# +# @mode: which COLO mode the VM was in when it exited. +# +# @reason: describes the reason for the COLO exit. +# +# @error: #optional, error message. Only present on error happening. +# +# Since: 2.6 +## +{ 'event': 'COLO_EXIT', + 'data': {'mode': 'COLOMode', 'reason': 'COLOExitReason', '*error': 'str' } } + +## # @ACPI_DEVICE_OST # # Emitted when guest executes ACPI _OST method. -- 1.8.3.1