Received: from eggs.gnu.org ([2001:4830:134:3::10]:45635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIaxj-00067V-7Y for qemu-devel@nongnu.org; Tue, 15 May 2018 10:30:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fIaxf-0005xU-0b for qemu-devel@nongnu.org; Tue, 15 May 2018 10:29:59 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:57862 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 1fIaxe-0005x5-RK for qemu-devel@nongnu.org; Tue, 15 May 2018 10:29:54 -0400 From: Markus Armbruster References: <1526268228-27951-1-git-send-email-zhangckid@gmail.com> <1526268228-27951-11-git-send-email-zhangckid@gmail.com> Date: Tue, 15 May 2018 16:29:52 +0200 In-Reply-To: <1526268228-27951-11-git-send-email-zhangckid@gmail.com> (Zhang Chen's message of "Mon, 14 May 2018 11:23:41 +0800") Message-ID: <87603p6lgf.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH V7 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: Zhang Chen Cc: qemu-devel@nongnu.org, zhanghailiang , Li Zhijian , Jason Wang , "Dr . David Alan Gilbert" , Paolo Bonzini Zhang Chen writes: > 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 | 20 ++++++++++++++++++++ > qapi/migration.json | 37 +++++++++++++++++++++++++++++++++++++ > 2 files changed, 57 insertions(+) > > diff --git a/migration/colo.c b/migration/colo.c > index c083d36..8ca6381 100644 > --- a/migration/colo.c > +++ b/migration/colo.c > @@ -28,6 +28,7 @@ > #include "net/colo-compare.h" > #include "net/colo.h" > #include "block/block.h" > +#include "qapi/qapi-events-migration.h" > > static bool vmstate_loading; > static Notifier packets_compare_notifier; > @@ -514,6 +515,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); > + } Your comment makes me suspect failover_get_state() can only be FAILOVER_STATUS_NONE or FAILOVER_STATUS_REQUIRE here. Is that correct? If yes, I recommend to add a suitable assertion. > + > /* Hope this not to be too long to wait here */ > qemu_sem_wait(&s->colo_exit_sem); > qemu_sem_destroy(&s->colo_exit_sem); > @@ -744,6 +757,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); > + } Same question. > > if (fb) { > qemu_fclose(fb); > diff --git a/qapi/migration.json b/qapi/migration.json > index f3974c6..55dae48 100644 > --- a/qapi/migration.json > +++ b/qapi/migration.json > @@ -875,6 +875,43 @@ > '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 > +# > +# Example: > +# > +# <- { "timestamp": {"seconds": 2032141960, "microseconds": 417172}, > +# "event": "COLO_EXIT", "data": {"mode": "primary", "reason": "request" } } > +# > +## > +{ 'event': 'COLO_EXIT', > + 'data': {'mode': 'COLOMode', 'reason': 'COLOExitReason' } } 'data' duplicates the next patch's ColoStatus, except it lacks @colo-running. Factoring out the common part doesn't seem worth the bother. Okay as is. > + > +## > +# @COLOExitReason: > +# > +# The reason for a COLO exit > +# > +# @none: no failover has ever happened. This can't occur in the COLO_EXIT event, only in the result of query-colo-status, can it? Worth spelling that out in the documentation? > +# > +# @request: COLO exit is due to an external request > +# > +# @error: COLO exit is due to an internal error > +# > +# Since: 2.13 > +## > +{ 'enum': 'COLOExitReason', > + 'data': [ 'none', 'request', 'error' ] } > + > +## > # @x-colo-lost-heartbeat: > # > # Tell qemu that heartbeat is lost, request it to do takeover procedures.