From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52700) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQuQm-0007uK-RP for qemu-devel@nongnu.org; Thu, 07 Jun 2018 08:54:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQuQj-00044V-PN for qemu-devel@nongnu.org; Thu, 07 Jun 2018 08:54:20 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:39098 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fQuQj-00044D-KV for qemu-devel@nongnu.org; Thu, 07 Jun 2018 08:54:17 -0400 From: Markus Armbruster References: <20180603050546.6827-1-zhangckid@gmail.com> <20180603050546.6827-11-zhangckid@gmail.com> <514033a5-9504-efc2-a208-d38bcff36075@redhat.com> Date: Thu, 07 Jun 2018 14:54:15 +0200 In-Reply-To: <514033a5-9504-efc2-a208-d38bcff36075@redhat.com> (Eric Blake's message of "Mon, 4 Jun 2018 17:23:15 -0500") Message-ID: <87in6uwydk.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH V8 10/17] qmp event: Add COLO_EXIT event to notify users while exited COLO List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake Cc: Zhang Chen , qemu-devel@nongnu.org, Paolo Bonzini , Juan Quintela , "Dr . David Alan Gilbert" , Jason Wang , zhanghailiang , Li Zhijian Eric Blake writes: > On 06/03/2018 12:05 AM, Zhang Chen wrote: >> 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. >> >> Signed-off-by: zhanghailiang >> Signed-off-by: Li Zhijian >> Signed-off-by: Zhang Chen >> Reviewed-by: Eric Blake >> --- >> migration/colo.c | 31 +++++++++++++++++++++++++++++++ >> qapi/migration.json | 38 ++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 69 insertions(+) >> >> diff --git a/migration/colo.c b/migration/colo.c >> index c083d3696f..bedb677788 100644 >> --- a/migration/colo.c > >> + /* >> + * There are only two reasons we can go here, some error happened. >> + * Or the user triggered failover. > > s/go here/get here/ > s/happened. Or/happened, or/ > >> +++ b/qapi/migration.json >> @@ -880,6 +880,44 @@ >> { 'enum': 'FailoverStatus', >> 'data': [ 'none', 'require', 'active', 'completed', 'relaunch' ] } >> +## >> +# @COLO_EXIT: >> +# >> +# Emitted when VM finishes COLO mode due to some errors happening or >> +# at the request of users. >> +# >> +# @mode: report COLO mode when COLO exited. >> +# >> +# @reason: describes the reason for the COLO exit. >> +# >> +# Since: 2.13 > > s/2.13/3.0/ > >> +# >> +# Example: >> +# >> +# <- { "timestamp": {"seconds": 2032141960, "microseconds": 417172}, >> +# "event": "COLO_EXIT", "data": {"mode": "primary", "reason": "request" } } >> +# >> +## >> +{ 'event': 'COLO_EXIT', >> + 'data': {'mode': 'COLOMode', 'reason': 'COLOExitReason' } } >> + >> +## >> +# @COLOExitReason: >> +# >> +# The reason for a COLO exit >> +# >> +# @none: no failover has ever happened, This can't occur in the COLO_EXIT event, > > s/happened,/happened./ While there, wrap the line around column 70, please. >> +# only in the result of query-colo-status. >> +# >> +# @request: COLO exit is due to an external request >> +# >> +# @error: COLO exit is due to an internal error >> +# >> +# Since: 2.13 > > s/2.13/3.0/ > >> +## >> +{ 'enum': 'COLOExitReason', >> + 'data': [ 'none', 'request', 'error' ] } >> + >> ## >> # @x-colo-lost-heartbeat: >> # >> With these touch-ups: Reviewed-by: Markus Armbruster