From patchwork Thu Jan 4 06:01:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10143903 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 885E36034B for ; Thu, 4 Jan 2018 06:11:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C53F283FF for ; Thu, 4 Jan 2018 06:11:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 713FC2841C; Thu, 4 Jan 2018 06:11:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DE9D4283FF for ; Thu, 4 Jan 2018 06:11:23 +0000 (UTC) Received: from localhost ([::1]:47503 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWykN-0003qG-36 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 04 Jan 2018 01:11:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36998) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWybc-0003rI-8r for qemu-devel@nongnu.org; Thu, 04 Jan 2018 01:02:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWybZ-0004IX-5c for qemu-devel@nongnu.org; Thu, 04 Jan 2018 01:02:20 -0500 Received: from mail-pg0-x22c.google.com ([2607:f8b0:400e:c05::22c]:33498) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWybY-0004I4-WF for qemu-devel@nongnu.org; Thu, 04 Jan 2018 01:02:17 -0500 Received: by mail-pg0-x22c.google.com with SMTP id i196so344207pgd.0 for ; Wed, 03 Jan 2018 22:02:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tBa4kAZZYbqvHRI7xCyuFTa4/HARGEGxBqo/NIzoUm4=; b=A6KEN00MvsPW7hs5RGGbAwt3i+5SyekOl6F7pOXlPSX5TasVnHfZRp08YYLvgBkHiu SAT+pvqHM0nHwO3cv1DfCzNkMLTsm9Um/RqJ62hcRBHGX56cQ4xY8kJykL2QYXMiMuTp 9f8cDij1XA1rLa2HEmf6X5yyDmUf9VGl7JX5Vde/op8sjZlMcueAW38zXbhmbwCFWgNf oFZO71c1cqHdgelLSdceSnVdN30IqmOCLuoDHIdkML8r+5Mpmis80Frpt+i9XwEqGp0j BvRBQu4LmBYfLqn2tO57sjIBXawd9QuRPV+BO7A+UDXRtQEM/5g8u+rloW1+DILGO1qC Wvsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tBa4kAZZYbqvHRI7xCyuFTa4/HARGEGxBqo/NIzoUm4=; b=DKr7R6l0sRtkJTdCHajj/RiH8FzK67rAsjH74HhAbxL4KEHxX4s9E/u0qq5SW6UPJN Te0qJiDKzBQGh75mUt1WImhfNVBOihWLW/Rp5HZGm9IX48Z/+BTIoUieewV6q8epVKjm 2nQkc5EAJinxAP6Qj5xdGyviotIDF8YX1FbX21Tr4/IIXILocBvzj8iALFFpn30HeK0R xVe/EmqSSk7/bbY/gnQdNCNM3SD4oKI2eNlfz3BWSVzboLXT7uNEz+7/CdvTZx5RdYLr WcRPIGReFcKujzEKk97QDzTUoNVZcnf9HVDUycNzxPUTi97lqozjJN6BPj3uGcCazuz+ dVww== X-Gm-Message-State: AKGB3mIYisBwZX0hf639kYaJbS3YqY1eSNuCjQatMMIKMLeHt9kSLRXk V2lHBGHjjiiBbfqXwGIkvbeJsvVG X-Google-Smtp-Source: ACJfBouKIoyz7bRocFUrkkI+tmv19yJUDjgpBrIIwGrU06HTU03p6xBGFcrJLXZdH7RYYypF/aosfA== X-Received: by 10.98.76.203 with SMTP id e72mr3662956pfj.91.1515045735645; Wed, 03 Jan 2018 22:02:15 -0800 (PST) Received: from localhost.localdomain (120.236.201.35.bc.googleusercontent.com. [35.201.236.120]) by smtp.gmail.com with ESMTPSA id w5sm6214775pfi.74.2018.01.03.22.02.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Jan 2018 22:02:14 -0800 (PST) From: Zhang Chen To: qemu devel Date: Thu, 4 Jan 2018 14:01:09 +0800 Message-Id: <1515045675-6993-11-git-send-email-zhangckid@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515045675-6993-1-git-send-email-zhangckid@gmail.com> References: <1515045675-6993-1-git-send-email-zhangckid@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::22c Subject: [Qemu-devel] [PATCH RESEND V3 10/16] qmp event: Add COLO_EXIT event to notify users while exited COLO X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Roth , Zhang Chen , zhanghailiang , Li Zhijian , Markus Armbruster Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: zhanghailiang If some errors happen during VM's COLO FT stage, it's important to notify the users of this event. Together with 'x_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 Signed-off-by: Zhang Chen Reviewed-by: Eric Blake --- migration/colo.c | 19 +++++++++++++++++++ qapi-schema.json | 21 +++++++++++++++++++++ qapi/migration.json | 13 +++++++++++++ 3 files changed, 53 insertions(+) diff --git a/migration/colo.c b/migration/colo.c index 8d2e3f8..790b122 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -516,6 +516,18 @@ out: qemu_fclose(fb); } + /* + * There are only two reasons we can go here, some error happened. + * Or the user triggered failover. + */ + if (failover_get_state() == FAILOVER_STATUS_NONE) { + qapi_event_send_colo_exit(COLO_MODE_PRIMARY, + COLO_EXIT_REASON_ERROR, NULL); + } else { + qapi_event_send_colo_exit(COLO_MODE_PRIMARY, + COLO_EXIT_REASON_REQUEST, NULL); + } + /* Hope this not to be too long to wait here */ qemu_sem_wait(&s->colo_exit_sem); qemu_sem_destroy(&s->colo_exit_sem); @@ -746,6 +758,13 @@ out: if (local_err) { error_report_err(local_err); } + if (failover_get_state() == FAILOVER_STATUS_NONE) { + qapi_event_send_colo_exit(COLO_MODE_SECONDARY, + COLO_EXIT_REASON_ERROR, NULL); + } else { + qapi_event_send_colo_exit(COLO_MODE_SECONDARY, + COLO_EXIT_REASON_REQUEST, NULL); + } if (fb) { qemu_fclose(fb); diff --git a/qapi-schema.json b/qapi-schema.json index 5c06745..4ff6d2c 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2921,6 +2921,27 @@ { 'command': 'query-acpi-ospm-status', 'returns': ['ACPIOSTInfo'] } ## +# @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. +# +# Since: 2.11 +# +# Example: +# +# <- { "timestamp": {"seconds": 2032141960, "microseconds": 417172}, +# "event": "COLO_EXIT", "data": {"mode": "primary", "reason": "request" } } +# +## +{ 'event': 'COLO_EXIT', + 'data': {'mode': 'COLOMode', 'reason': 'COLOExitReason' } } + +## # @ACPI_DEVICE_OST: # # Emitted when guest executes ACPI _OST method. diff --git a/qapi/migration.json b/qapi/migration.json index 03f57c9..f7b2cc6 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -854,6 +854,19 @@ ## { 'enum': 'FailoverStatus', 'data': [ 'none', 'require', 'active', 'completed', 'relaunch' ] } +## +# @COLOExitReason: +# +# The reason for a COLO exit +# +# @request: COLO exit is due to an external request +# +# @error: COLO exit is due to an internal error +# +# Since: 2.11 +## +{ 'enum': 'COLOExitReason', + 'data': [ 'request', 'error' ] } ## # @x-colo-lost-heartbeat: