diff mbox series

[V10,10/20] qmp event: Add COLO_EXIT event to notify users while exited COLO

Message ID 20180722193350.6028-11-zhangckid@gmail.com
State New
Headers show
Series COLO: integrate colo frame with block replication and COLO proxy | expand

Commit Message

Zhang Chen July 22, 2018, 7:33 p.m. UTC 
From: zhanghailiang <zhang.zhanghailiang@huawei.com>

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 <zhang.zhanghailiang@huawei.com>
Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
Signed-off-by: Zhang Chen <zhangckid@gmail.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---
 migration/colo.c    | 31 +++++++++++++++++++++++++++++++
 qapi/migration.json | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

Comments

Eric Blake July 23, 2018, 6:41 p.m. UTC | #1 
On 07/22/2018 02:33 PM, Zhang Chen wrote:
> From: zhanghailiang <zhang.zhanghailiang@huawei.com>
> 
> 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 <zhang.zhanghailiang@huawei.com>
> Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
> Signed-off-by: Zhang Chen <zhangckid@gmail.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> Reviewed-by: Markus Armbruster <armbru@redhat.com>
> ---
>   migration/colo.c    | 31 +++++++++++++++++++++++++++++++
>   qapi/migration.json | 38 ++++++++++++++++++++++++++++++++++++++
>   2 files changed, 69 insertions(+)

At this point in the release cycle, this series feels like enough of a 
new feature (rather than a bug fix) that it is probably not appropriate 
for 3.0, which means...


> +++ b/qapi/migration.json
> @@ -900,6 +900,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: 3.0

...this and other references should be updated to 3.1.
Zhang Chen July 24, 2018, 9:56 a.m. UTC | #2 
On Tue, Jul 24, 2018 at 2:41 AM, Eric Blake <eblake@redhat.com> wrote:

> On 07/22/2018 02:33 PM, Zhang Chen wrote:
>
>> From: zhanghailiang <zhang.zhanghailiang@huawei.com>
>>
>> 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 <zhang.zhanghailiang@huawei.com>
>> Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
>> Signed-off-by: Zhang Chen <zhangckid@gmail.com>
>> Reviewed-by: Eric Blake <eblake@redhat.com>
>> Reviewed-by: Markus Armbruster <armbru@redhat.com>
>> ---
>>   migration/colo.c    | 31 +++++++++++++++++++++++++++++++
>>   qapi/migration.json | 38 ++++++++++++++++++++++++++++++++++++++
>>   2 files changed, 69 insertions(+)
>>
>
> At this point in the release cycle, this series feels like enough of a new
> feature (rather than a bug fix) that it is probably not appropriate for
> 3.0, which means...
>
>
> +++ b/qapi/migration.json
>> @@ -900,6 +900,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: 3.0
>>
>
> ...this and other references should be updated to 3.1.


OK, I will fix it and resend this series.

Thanks
Zhang Chen


>
>
> --
> Eric Blake, Principal Software Engineer
> Red Hat, Inc.           +1-919-301-3266
> Virtualization:  qemu.org | libvirt.org
>
Dr. David Alan Gilbert July 24, 2018, 2:54 p.m. UTC | #3 
* Zhang Chen (zhangckid@gmail.com) wrote:
> On Tue, Jul 24, 2018 at 2:41 AM, Eric Blake <eblake@redhat.com> wrote:
> 
> > On 07/22/2018 02:33 PM, Zhang Chen wrote:
> >
> >> From: zhanghailiang <zhang.zhanghailiang@huawei.com>
> >>
> >> 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 <zhang.zhanghailiang@huawei.com>
> >> Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
> >> Signed-off-by: Zhang Chen <zhangckid@gmail.com>
> >> Reviewed-by: Eric Blake <eblake@redhat.com>
> >> Reviewed-by: Markus Armbruster <armbru@redhat.com>
> >> ---
> >>   migration/colo.c    | 31 +++++++++++++++++++++++++++++++
> >>   qapi/migration.json | 38 ++++++++++++++++++++++++++++++++++++++
> >>   2 files changed, 69 insertions(+)
> >>
> >
> > At this point in the release cycle, this series feels like enough of a new
> > feature (rather than a bug fix) that it is probably not appropriate for
> > 3.0, which means...
> >
> >
> > +++ b/qapi/migration.json
> >> @@ -900,6 +900,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: 3.0
> >>
> >
> > ...this and other references should be updated to 3.1.
> 
> 
> OK, I will fix it and resend this series.

No need to resend now; resend after the review of the other bits in the
series; I'm sure there will be other minor things; anyway we can always
fix up version nunmbers in merge.

Dave

> Thanks
> Zhang Chen
> 
> 
> >
> >
> > --
> > Eric Blake, Principal Software Engineer
> > Red Hat, Inc.           +1-919-301-3266
> > Virtualization:  qemu.org | libvirt.org
> >
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
Zhang Chen July 25, 2018, 1:12 a.m. UTC | #4 
On Tue, Jul 24, 2018 at 10:54 PM, Dr. David Alan Gilbert <
dgilbert@redhat.com> wrote:

> * Zhang Chen (zhangckid@gmail.com) wrote:
> > On Tue, Jul 24, 2018 at 2:41 AM, Eric Blake <eblake@redhat.com> wrote:
> >
> > > On 07/22/2018 02:33 PM, Zhang Chen wrote:
> > >
> > >> From: zhanghailiang <zhang.zhanghailiang@huawei.com>
> > >>
> > >> 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 <zhang.zhanghailiang@huawei.com>
> > >> Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
> > >> Signed-off-by: Zhang Chen <zhangckid@gmail.com>
> > >> Reviewed-by: Eric Blake <eblake@redhat.com>
> > >> Reviewed-by: Markus Armbruster <armbru@redhat.com>
> > >> ---
> > >>   migration/colo.c    | 31 +++++++++++++++++++++++++++++++
> > >>   qapi/migration.json | 38 ++++++++++++++++++++++++++++++++++++++
> > >>   2 files changed, 69 insertions(+)
> > >>
> > >
> > > At this point in the release cycle, this series feels like enough of a
> new
> > > feature (rather than a bug fix) that it is probably not appropriate for
> > > 3.0, which means...
> > >
> > >
> > > +++ b/qapi/migration.json
> > >> @@ -900,6 +900,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: 3.0
> > >>
> > >
> > > ...this and other references should be updated to 3.1.
> >
> >
> > OK, I will fix it and resend this series.
>
> No need to resend now; resend after the review of the other bits in the
> series; I'm sure there will be other minor things; anyway we can always
> fix up version nunmbers in merge.
>

OK, I got it.

Thanks
Zhang Chen


>
> Dave
>
> > Thanks
> > Zhang Chen
> >
> >
> > >
> > >
> > > --
> > > Eric Blake, Principal Software Engineer
> > > Red Hat, Inc.           +1-919-301-3266
> > > Virtualization:  qemu.org | libvirt.org
> > >
> --
> Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
>
diff mbox series

Patch

diff --git a/migration/colo.c b/migration/colo.c
index c083d3696f..ab484ad754 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,23 @@  out:
         qemu_fclose(fb);
     }
 
+    /*
+     * There are only two reasons we can get here, some error happened
+     * or the user triggered failover.
+     */
+    switch (failover_get_state()) {
+    case FAILOVER_STATUS_NONE:
+        qapi_event_send_colo_exit(COLO_MODE_PRIMARY,
+                                  COLO_EXIT_REASON_ERROR, NULL);
+        break;
+    case FAILOVER_STATUS_REQUIRE:
+        qapi_event_send_colo_exit(COLO_MODE_PRIMARY,
+                                  COLO_EXIT_REASON_REQUEST, NULL);
+        break;
+    default:
+        abort();
+    }
+
     /* Hope this not to be too long to wait here */
     qemu_sem_wait(&s->colo_exit_sem);
     qemu_sem_destroy(&s->colo_exit_sem);
@@ -745,6 +763,19 @@  out:
         error_report_err(local_err);
     }
 
+    switch (failover_get_state()) {
+    case FAILOVER_STATUS_NONE:
+        qapi_event_send_colo_exit(COLO_MODE_SECONDARY,
+                                  COLO_EXIT_REASON_ERROR, NULL);
+        break;
+    case FAILOVER_STATUS_REQUIRE:
+        qapi_event_send_colo_exit(COLO_MODE_SECONDARY,
+                                  COLO_EXIT_REASON_REQUEST, NULL);
+        break;
+    default:
+        abort();
+    }
+
     if (fb) {
         qemu_fclose(fb);
     }
diff --git a/qapi/migration.json b/qapi/migration.json
index 186e8a7303..05f65680e1 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -900,6 +900,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: 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, 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: 3.0
+##
+{ 'enum': 'COLOExitReason',
+  'data': [ 'none', 'request', 'error' ] }
+
 ##
 # @x-colo-lost-heartbeat:
 #