| Message ID | 20180627204136.4177-13-zhangckid@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Zhang Chen <zhangckid@gmail.com> writes: > Libvirt or other high level software can use this command query colo status. > You can test this command like that: > {'execute':'query-colo-status'} > > Signed-off-by: Zhang Chen <zhangckid@gmail.com> > --- > migration/colo.c | 39 +++++++++++++++++++++++++++++++++++++++ > qapi/migration.json | 34 ++++++++++++++++++++++++++++++++++ > 2 files changed, 73 insertions(+) > > diff --git a/migration/colo.c b/migration/colo.c > index 8fdb79ac73..eb21978bff 100644 > --- a/migration/colo.c > +++ b/migration/colo.c > @@ -29,6 +29,7 @@ > #include "net/colo.h" > #include "block/block.h" > #include "qapi/qapi-events-migration.h" > +#include "qapi/qmp/qerror.h" > > static bool vmstate_loading; > static Notifier packets_compare_notifier; > @@ -237,6 +238,44 @@ void qmp_xen_colo_do_checkpoint(Error **errp) > #endif > } > > +COLOStatus *qmp_query_colo_status(Error **errp) > +{ > + int state; > + COLOStatus *s = g_new0(COLOStatus, 1); > + > + s->mode = get_colo_mode(); > + > + switch (s->mode) { > + case COLO_MODE_NONE: > + error_setg(errp, "COLO is disabled"); > + state = MIGRATION_STATUS_NONE; > + break; > + case COLO_MODE_PRIMARY: > + state = migrate_get_current()->state; > + break; > + case COLO_MODE_SECONDARY: > + state = migration_incoming_get_current()->state; > + break; > + default: > + abort(); > + } > + > + s->active = state == MIGRATION_STATUS_COLO; > + > + switch (failover_get_state()) { > + case FAILOVER_STATUS_NONE: > + s->reason = COLO_EXIT_REASON_NONE; > + break; > + case FAILOVER_STATUS_REQUIRE: > + s->reason = COLO_EXIT_REASON_REQUEST; > + break; > + default: > + s->reason = COLO_EXIT_REASON_ERROR; > + } > + > + return s; > +} > + > static void colo_send_message(QEMUFile *f, COLOMessage msg, > Error **errp) > { > diff --git a/qapi/migration.json b/qapi/migration.json > index c24f114104..73c64686ec 100644 > --- a/qapi/migration.json > +++ b/qapi/migration.json > @@ -1248,6 +1248,40 @@ > ## > { 'command': 'xen-colo-do-checkpoint' } > > +## > +# @COLOStatus: > +# > +# The result format for 'query-colo-status'. > +# > +# @mode: COLO running mode. If COLO is running, this field will return > +# 'primary' or 'secondary'. Please mention that @mode is "none" when COLO is not running. > +# > +# @active: true if COLO is active. Please use consistent terminology: pick one of "COLO is running", "COLO is active" and stick to it. v8 had that here, v9 regressed. Also use this wording for the comment improvement I requested for PATCH 11. However, isn't @active redundant with @mode? > +# > +# @reason: describes the reason for the COLO exit. > +# > +# Since: 3.0 > +## > +{ 'struct': 'COLOStatus', > + 'data': { 'mode': 'COLOMode', 'active': 'bool', 'reason': 'COLOExitReason' } } > + > +## > +# @query-colo-status: > +# > +# Query COLO status while the vm is running. > +# > +# Returns: A @COLOStatus object showing the status. > +# > +# Example: > +# > +# -> { "execute": "query-colo-status" } > +# <- { "return": { "mode": "primary", "active": true, "reason": "request" } } > +# > +# Since: 3.0 > +## > +{ 'command': 'query-colo-status', > + 'returns': 'COLOStatus' } > + > ## > # @migrate-recover: > #
On Tue, Jul 3, 2018 at 7:09 PM, Markus Armbruster <armbru@redhat.com> wrote: > Zhang Chen <zhangckid@gmail.com> writes: > > > Libvirt or other high level software can use this command query colo > status. > > You can test this command like that: > > {'execute':'query-colo-status'} > > > > Signed-off-by: Zhang Chen <zhangckid@gmail.com> > > --- > > migration/colo.c | 39 +++++++++++++++++++++++++++++++++++++++ > > qapi/migration.json | 34 ++++++++++++++++++++++++++++++++++ > > 2 files changed, 73 insertions(+) > > > > diff --git a/migration/colo.c b/migration/colo.c > > index 8fdb79ac73..eb21978bff 100644 > > --- a/migration/colo.c > > +++ b/migration/colo.c > > @@ -29,6 +29,7 @@ > > #include "net/colo.h" > > #include "block/block.h" > > #include "qapi/qapi-events-migration.h" > > +#include "qapi/qmp/qerror.h" > > > > static bool vmstate_loading; > > static Notifier packets_compare_notifier; > > @@ -237,6 +238,44 @@ void qmp_xen_colo_do_checkpoint(Error **errp) > > #endif > > } > > > > +COLOStatus *qmp_query_colo_status(Error **errp) > > +{ > > + int state; > > + COLOStatus *s = g_new0(COLOStatus, 1); > > + > > + s->mode = get_colo_mode(); > > + > > + switch (s->mode) { > > + case COLO_MODE_NONE: > > + error_setg(errp, "COLO is disabled"); > > + state = MIGRATION_STATUS_NONE; > > + break; > > + case COLO_MODE_PRIMARY: > > + state = migrate_get_current()->state; > > + break; > > + case COLO_MODE_SECONDARY: > > + state = migration_incoming_get_current()->state; > > + break; > > + default: > > + abort(); > > + } > > + > > + s->active = state == MIGRATION_STATUS_COLO; > > + > > + switch (failover_get_state()) { > > + case FAILOVER_STATUS_NONE: > > + s->reason = COLO_EXIT_REASON_NONE; > > + break; > > + case FAILOVER_STATUS_REQUIRE: > > + s->reason = COLO_EXIT_REASON_REQUEST; > > + break; > > + default: > > + s->reason = COLO_EXIT_REASON_ERROR; > > + } > > + > > + return s; > > +} > > + > > static void colo_send_message(QEMUFile *f, COLOMessage msg, > > Error **errp) > > { > > diff --git a/qapi/migration.json b/qapi/migration.json > > index c24f114104..73c64686ec 100644 > > --- a/qapi/migration.json > > +++ b/qapi/migration.json > > @@ -1248,6 +1248,40 @@ > > ## > > { 'command': 'xen-colo-do-checkpoint' } > > > > +## > > +# @COLOStatus: > > +# > > +# The result format for 'query-colo-status'. > > +# > > +# @mode: COLO running mode. If COLO is running, this field will return > > +# 'primary' or 'secondary'. > > Please mention that @mode is "none" when COLO is not running. > OK. > > > +# > > +# @active: true if COLO is active. > > Please use consistent terminology: pick one of "COLO is running", "COLO > is active" and stick to it. v8 had that here, v9 regressed. Also use > this wording for the comment improvement I requested for PATCH 11. > > However, isn't @active redundant with @mode? > > I re-think about this and review the codes. The 'none' mode can cover this field, I will remove the @active in next version. By the way, can you review the diagram patch as your comments? (have some action not related to qmp, so I just drew a general diagram.) Thanks Zhang Chen > > +# > > +# @reason: describes the reason for the COLO exit. > > +# > > +# Since: 3.0 > > +## > > +{ 'struct': 'COLOStatus', > > + 'data': { 'mode': 'COLOMode', 'active': 'bool', 'reason': > 'COLOExitReason' } } > > + > > +## > > +# @query-colo-status: > > +# > > +# Query COLO status while the vm is running. > > +# > > +# Returns: A @COLOStatus object showing the status. > > +# > > +# Example: > > +# > > +# -> { "execute": "query-colo-status" } > > +# <- { "return": { "mode": "primary", "active": true, "reason": > "request" } } > > +# > > +# Since: 3.0 > > +## > > +{ 'command': 'query-colo-status', > > + 'returns': 'COLOStatus' } > > + > > ## > > # @migrate-recover: > > # >
Zhang Chen <zhangckid@gmail.com> writes: > On Tue, Jul 3, 2018 at 7:09 PM, Markus Armbruster <armbru@redhat.com> wrote: > >> Zhang Chen <zhangckid@gmail.com> writes: >> >> > Libvirt or other high level software can use this command query colo >> status. >> > You can test this command like that: >> > {'execute':'query-colo-status'} >> > >> > Signed-off-by: Zhang Chen <zhangckid@gmail.com> [...] >> > diff --git a/qapi/migration.json b/qapi/migration.json >> > index c24f114104..73c64686ec 100644 >> > --- a/qapi/migration.json >> > +++ b/qapi/migration.json >> > @@ -1248,6 +1248,40 @@ >> > ## >> > { 'command': 'xen-colo-do-checkpoint' } >> > >> > +## >> > +# @COLOStatus: >> > +# >> > +# The result format for 'query-colo-status'. >> > +# >> > +# @mode: COLO running mode. If COLO is running, this field will return >> > +# 'primary' or 'secondary'. >> >> Please mention that @mode is "none" when COLO is not running. >> > > OK. > > >> >> > +# >> > +# @active: true if COLO is active. >> >> Please use consistent terminology: pick one of "COLO is running", "COLO >> is active" and stick to it. v8 had that here, v9 regressed. Also use >> this wording for the comment improvement I requested for PATCH 11. >> >> However, isn't @active redundant with @mode? >> >> > I re-think about this and review the codes. > The 'none' mode can cover this field, I will remove the @active in next > version. I like it. > By the way, can you review the diagram patch as your comments? > (have some action not related to qmp, so I just drew a general diagram.) I need to find some time for it. Do not hold the series until I do.
diff --git a/migration/colo.c b/migration/colo.c index 8fdb79ac73..eb21978bff 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -29,6 +29,7 @@ #include "net/colo.h" #include "block/block.h" #include "qapi/qapi-events-migration.h" +#include "qapi/qmp/qerror.h" static bool vmstate_loading; static Notifier packets_compare_notifier; @@ -237,6 +238,44 @@ void qmp_xen_colo_do_checkpoint(Error **errp) #endif } +COLOStatus *qmp_query_colo_status(Error **errp) +{ + int state; + COLOStatus *s = g_new0(COLOStatus, 1); + + s->mode = get_colo_mode(); + + switch (s->mode) { + case COLO_MODE_NONE: + error_setg(errp, "COLO is disabled"); + state = MIGRATION_STATUS_NONE; + break; + case COLO_MODE_PRIMARY: + state = migrate_get_current()->state; + break; + case COLO_MODE_SECONDARY: + state = migration_incoming_get_current()->state; + break; + default: + abort(); + } + + s->active = state == MIGRATION_STATUS_COLO; + + switch (failover_get_state()) { + case FAILOVER_STATUS_NONE: + s->reason = COLO_EXIT_REASON_NONE; + break; + case FAILOVER_STATUS_REQUIRE: + s->reason = COLO_EXIT_REASON_REQUEST; + break; + default: + s->reason = COLO_EXIT_REASON_ERROR; + } + + return s; +} + static void colo_send_message(QEMUFile *f, COLOMessage msg, Error **errp) { diff --git a/qapi/migration.json b/qapi/migration.json index c24f114104..73c64686ec 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1248,6 +1248,40 @@ ## { 'command': 'xen-colo-do-checkpoint' } +## +# @COLOStatus: +# +# The result format for 'query-colo-status'. +# +# @mode: COLO running mode. If COLO is running, this field will return +# 'primary' or 'secondary'. +# +# @active: true if COLO is active. +# +# @reason: describes the reason for the COLO exit. +# +# Since: 3.0 +## +{ 'struct': 'COLOStatus', + 'data': { 'mode': 'COLOMode', 'active': 'bool', 'reason': 'COLOExitReason' } } + +## +# @query-colo-status: +# +# Query COLO status while the vm is running. +# +# Returns: A @COLOStatus object showing the status. +# +# Example: +# +# -> { "execute": "query-colo-status" } +# <- { "return": { "mode": "primary", "active": true, "reason": "request" } } +# +# Since: 3.0 +## +{ 'command': 'query-colo-status', + 'returns': 'COLOStatus' } + ## # @migrate-recover: #
Libvirt or other high level software can use this command query colo status. You can test this command like that: {'execute':'query-colo-status'} Signed-off-by: Zhang Chen <zhangckid@gmail.com> --- migration/colo.c | 39 +++++++++++++++++++++++++++++++++++++++ qapi/migration.json | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+)