* [Qemu-devel] [PATCH V7 0/2] Add new qmp commands to suppurt Xen COLO @ 2017-02-08 5:24 Zhang Chen 2017-02-08 5:24 ` [Qemu-devel] [PATCH V7 1/2] Add a new qmp command to start/stop replication Zhang Chen 2017-02-08 5:24 ` [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status Zhang Chen 0 siblings, 2 replies; 19+ messages in thread From: Zhang Chen @ 2017-02-08 5:24 UTC (permalink / raw) To: qemu devel, Eric Blake Cc: Jason Wang, Zhang Chen, Li Zhijian, eddie . dong, bian naimeng Xen COLO depend on qemu COLO replication function. So, We need new qmp commands for Xen to use qemu replication. Corresponding libxl patches already in xen.git. Commit ID: ed37ef1f91c20f0ab162ce60f8c38400b917fa64 COLO: introduce new API to prepare/start/do/get_error/stop replication a0ddc0b359375b2418213966dfbdbfab593ecc6f tools/libxl: introduction of libxl__qmp_restore to load qemu state Zhang Chen (2): Add a new qmp command to start/stop replication Add a new qmp command to do checkpoint, query xen replication status migration/colo.c | 40 ++++++++++++++++++++++++++ qapi-schema.json | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+) -- 2.7.4 ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Qemu-devel] [PATCH V7 1/2] Add a new qmp command to start/stop replication 2017-02-08 5:24 [Qemu-devel] [PATCH V7 0/2] Add new qmp commands to suppurt Xen COLO Zhang Chen @ 2017-02-08 5:24 ` Zhang Chen 2017-02-21 12:53 ` Hailiang Zhang 2017-02-08 5:24 ` [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status Zhang Chen 1 sibling, 1 reply; 19+ messages in thread From: Zhang Chen @ 2017-02-08 5:24 UTC (permalink / raw) To: qemu devel, Eric Blake Cc: Jason Wang, Zhang Chen, Li Zhijian, eddie . dong, bian naimeng, Wen Congyang We can call this qmp command to start/stop replication outside of qemu. Like Xen colo need this function. Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> Signed-off-by: Wen Congyang <wencongyang@gmail.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> --- migration/colo.c | 23 +++++++++++++++++++++++ qapi-schema.json | 25 +++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/migration/colo.c b/migration/colo.c index 93c85c5..6fc2ade 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -19,6 +19,8 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "migration/failover.h" +#include "replication.h" +#include "qmp-commands.h" #define COLO_BUFFER_BASE_SIZE (4 * 1024 * 1024) @@ -104,6 +106,27 @@ void colo_do_failover(MigrationState *s) } } +void qmp_xen_set_replication(bool enable, bool primary, + bool has_failover, bool failover, + Error **errp) +{ + ReplicationMode mode = primary ? + REPLICATION_MODE_PRIMARY : + REPLICATION_MODE_SECONDARY; + + if (has_failover && enable) { + error_setg(errp, "Parameter 'failover' is only for" + " stopping replication"); + return; + } + + if (enable) { + replication_start_all(mode, errp); + } else { + replication_stop_all(failover, failover ? NULL : errp); + } +} + static void colo_send_message(QEMUFile *f, COLOMessage msg, Error **errp) { diff --git a/qapi-schema.json b/qapi-schema.json index cbdffdd..9445b93 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -5906,6 +5906,31 @@ { 'command': 'xen-load-devices-state', 'data': {'filename': 'str'} } ## +# @xen-set-replication: +# +# Enable or disable replication. +# +# @enable: true to enable, false to disable. +# +# @primary: true for primary or false for secondary. +# +# @failover: #optional true to do failover, false to stop. but cannot be +# specified if 'enable' is true. default value is false. +# +# Returns: nothing. +# +# Example: +# +# -> { "execute": "xen-set-replication", +# "arguments": {"enable": true, "primary": false} } +# <- { "return": {} } +# +# Since: 2.9 +## +{ 'command': 'xen-set-replication', + 'data': { 'enable': 'bool', 'primary': 'bool', '*failover' : 'bool' } } + +## # @GICCapability: # # The struct describes capability for a specific GIC (Generic -- 2.7.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PATCH V7 1/2] Add a new qmp command to start/stop replication 2017-02-08 5:24 ` [Qemu-devel] [PATCH V7 1/2] Add a new qmp command to start/stop replication Zhang Chen @ 2017-02-21 12:53 ` Hailiang Zhang 0 siblings, 0 replies; 19+ messages in thread From: Hailiang Zhang @ 2017-02-21 12:53 UTC (permalink / raw) To: Zhang Chen, qemu devel, Eric Blake Cc: xuquan8, Li Zhijian, Jason Wang, eddie . dong, Wen Congyang, bian naimeng On 2017/2/8 13:24, Zhang Chen wrote: > We can call this qmp command to start/stop replication outside of qemu. > Like Xen colo need this function. > > Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> > Signed-off-by: Wen Congyang <wencongyang@gmail.com> > Reviewed-by: Eric Blake <eblake@redhat.com> > Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > Reviewed-by: zhanghailiang <zhang.zhanghailiang@huawei.com> > --- > migration/colo.c | 23 +++++++++++++++++++++++ > qapi-schema.json | 25 +++++++++++++++++++++++++ > 2 files changed, 48 insertions(+) > > diff --git a/migration/colo.c b/migration/colo.c > index 93c85c5..6fc2ade 100644 > --- a/migration/colo.c > +++ b/migration/colo.c > @@ -19,6 +19,8 @@ > #include "qemu/error-report.h" > #include "qapi/error.h" > #include "migration/failover.h" > +#include "replication.h" > +#include "qmp-commands.h" > > #define COLO_BUFFER_BASE_SIZE (4 * 1024 * 1024) > > @@ -104,6 +106,27 @@ void colo_do_failover(MigrationState *s) > } > } > > +void qmp_xen_set_replication(bool enable, bool primary, > + bool has_failover, bool failover, > + Error **errp) > +{ > + ReplicationMode mode = primary ? > + REPLICATION_MODE_PRIMARY : > + REPLICATION_MODE_SECONDARY; > + > + if (has_failover && enable) { > + error_setg(errp, "Parameter 'failover' is only for" > + " stopping replication"); > + return; > + } > + > + if (enable) { > + replication_start_all(mode, errp); > + } else { > + replication_stop_all(failover, failover ? NULL : errp); > + } > +} > + > static void colo_send_message(QEMUFile *f, COLOMessage msg, > Error **errp) > { > diff --git a/qapi-schema.json b/qapi-schema.json > index cbdffdd..9445b93 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -5906,6 +5906,31 @@ > { 'command': 'xen-load-devices-state', 'data': {'filename': 'str'} } > > ## > +# @xen-set-replication: > +# > +# Enable or disable replication. > +# > +# @enable: true to enable, false to disable. > +# > +# @primary: true for primary or false for secondary. > +# > +# @failover: #optional true to do failover, false to stop. but cannot be > +# specified if 'enable' is true. default value is false. > +# > +# Returns: nothing. > +# > +# Example: > +# > +# -> { "execute": "xen-set-replication", > +# "arguments": {"enable": true, "primary": false} } > +# <- { "return": {} } > +# > +# Since: 2.9 > +## > +{ 'command': 'xen-set-replication', > + 'data': { 'enable': 'bool', 'primary': 'bool', '*failover' : 'bool' } } > + > +## > # @GICCapability: > # > # The struct describes capability for a specific GIC (Generic > ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status 2017-02-08 5:24 [Qemu-devel] [PATCH V7 0/2] Add new qmp commands to suppurt Xen COLO Zhang Chen 2017-02-08 5:24 ` [Qemu-devel] [PATCH V7 1/2] Add a new qmp command to start/stop replication Zhang Chen @ 2017-02-08 5:24 ` Zhang Chen 2017-02-08 21:35 ` Eric Blake ` (2 more replies) 1 sibling, 3 replies; 19+ messages in thread From: Zhang Chen @ 2017-02-08 5:24 UTC (permalink / raw) To: qemu devel, Eric Blake Cc: Jason Wang, Zhang Chen, Li Zhijian, eddie . dong, bian naimeng, Wen Congyang We can call this qmp command to do checkpoint outside of qemu. Xen colo will need this function. Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> Signed-off-by: Wen Congyang <wencongyang@gmail.com> --- migration/colo.c | 17 ++++++++++++++++ qapi-schema.json | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/migration/colo.c b/migration/colo.c index 6fc2ade..2f98a33 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -127,6 +127,23 @@ void qmp_xen_set_replication(bool enable, bool primary, } } +ReplicationResult *qmp_query_xen_replication_status(Error **errp) +{ + Error *err = NULL; + ReplicationResult *result = g_new0(ReplicationResult, 1); + replication_get_error_all(&err); + result->status = err ? + REPLICATION_STATUS_ERROR : + REPLICATION_STATUS_NORMAL; + error_free(err); + return result; +} + +void qmp_xen_do_checkpoint(Error **errp) +{ + replication_do_checkpoint_all(errp); +} + static void colo_send_message(QEMUFile *f, COLOMessage msg, Error **errp) { diff --git a/qapi-schema.json b/qapi-schema.json index 9445b93..719744a 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -5931,6 +5931,66 @@ 'data': { 'enable': 'bool', 'primary': 'bool', '*failover' : 'bool' } } ## +# @ReplicationStatus: +# +# Describe the status of replication. +# +# @error: Replication has an error. +# +# @normal: Replication is running normally. +# +# Since: 2.9 +## +{ 'enum': 'ReplicationStatus', + 'data': [ 'error', 'normal' ] } + +## +# @ReplicationResult: +# +# The result format for 'query-xen-replication-status'. +# +# @status: enum of @ReplicationStatus, which shows current +# replication error status +# +# Since: 2.9 +## +{ 'struct': 'ReplicationResult', + 'data': { 'status': 'ReplicationStatus'} } + +## +# @query-xen-replication-status: +# +# Query replication status while the vm is running. +# +# Returns: A @ReplicationResult objects showing the status. +# +# Example: +# +# -> { "execute": "query-xen-replication-status" } +# <- { "return": { "status": "normal" } } +# +# Since: 2.9 +## +{ 'command': 'query-xen-replication-status', + 'returns': 'ReplicationResult' } + +## +# @xen-do-checkpoint: +# +# Xen uses this command to notify replication to trigger a checkpoint. +# +# Returns: nothing. +# +# Example: +# +# -> { "execute": "xen-do-checkpoint" } +# <- { "return": {} } +# +# Since: 2.9 +## +{ 'command': 'xen-do-checkpoint' } + +## # @GICCapability: # # The struct describes capability for a specific GIC (Generic -- 2.7.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status 2017-02-08 5:24 ` [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status Zhang Chen @ 2017-02-08 21:35 ` Eric Blake 2017-02-09 2:03 ` Zhang Chen 2017-02-13 20:28 ` Stefano Stabellini 2017-02-21 11:15 ` Markus Armbruster 2017-02-21 13:01 ` Hailiang Zhang 2 siblings, 2 replies; 19+ messages in thread From: Eric Blake @ 2017-02-08 21:35 UTC (permalink / raw) To: Zhang Chen, qemu devel Cc: Jason Wang, Li Zhijian, eddie . dong, bian naimeng, Wen Congyang [-- Attachment #1: Type: text/plain, Size: 599 bytes --] On 02/07/2017 11:24 PM, Zhang Chen wrote: > We can call this qmp command to do checkpoint outside of qemu. > Xen colo will need this function. > > Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> > Signed-off-by: Wen Congyang <wencongyang@gmail.com> > --- > migration/colo.c | 17 ++++++++++++++++ > qapi-schema.json | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 77 insertions(+) > Reviewed-by: Eric Blake <eblake@redhat.com> -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 604 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status 2017-02-08 21:35 ` Eric Blake @ 2017-02-09 2:03 ` Zhang Chen 2017-02-13 20:28 ` Stefano Stabellini 1 sibling, 0 replies; 19+ messages in thread From: Zhang Chen @ 2017-02-09 2:03 UTC (permalink / raw) To: Eric Blake, qemu devel Cc: Jason Wang, Li Zhijian, eddie . dong, bian naimeng, Wen Congyang On 02/09/2017 05:35 AM, Eric Blake wrote: > On 02/07/2017 11:24 PM, Zhang Chen wrote: >> We can call this qmp command to do checkpoint outside of qemu. >> Xen colo will need this function. >> >> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> >> Signed-off-by: Wen Congyang <wencongyang@gmail.com> >> --- >> migration/colo.c | 17 ++++++++++++++++ >> qapi-schema.json | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 77 insertions(+) >> > Reviewed-by: Eric Blake <eblake@redhat.com> Thank you for your review. By the way, who can pick up this patch? You or Jason? Thanks Zhang Chen -- Thanks Zhang Chen ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status 2017-02-08 21:35 ` Eric Blake 2017-02-09 2:03 ` Zhang Chen @ 2017-02-13 20:28 ` Stefano Stabellini 2017-02-16 3:25 ` Zhang Chen 1 sibling, 1 reply; 19+ messages in thread From: Stefano Stabellini @ 2017-02-13 20:28 UTC (permalink / raw) To: Eric Blake Cc: Zhang Chen, qemu devel, Wen Congyang, Jason Wang, eddie . dong, bian naimeng, Li Zhijian On Wed, 8 Feb 2017, Eric Blake wrote: > On 02/07/2017 11:24 PM, Zhang Chen wrote: > > We can call this qmp command to do checkpoint outside of qemu. > > Xen colo will need this function. > > > > Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> > > Signed-off-by: Wen Congyang <wencongyang@gmail.com> > > --- > > migration/colo.c | 17 ++++++++++++++++ > > qapi-schema.json | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > > 2 files changed, 77 insertions(+) > > > > Reviewed-by: Eric Blake <eblake@redhat.com> Given that the series is all acked, are you going to take care of the pull request? ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status 2017-02-13 20:28 ` Stefano Stabellini @ 2017-02-16 3:25 ` Zhang Chen 2017-02-16 5:08 ` Jason Wang 0 siblings, 1 reply; 19+ messages in thread From: Zhang Chen @ 2017-02-16 3:25 UTC (permalink / raw) To: Eric Blake Cc: Stefano Stabellini, qemu devel, Wen Congyang, Jason Wang, eddie . dong, bian naimeng, Li Zhijian Ping... No new for a long time. Who can pick up this patch? Thanks Zhang Chen On 02/14/2017 04:28 AM, Stefano Stabellini wrote: > On Wed, 8 Feb 2017, Eric Blake wrote: >> On 02/07/2017 11:24 PM, Zhang Chen wrote: >>> We can call this qmp command to do checkpoint outside of qemu. >>> Xen colo will need this function. >>> >>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> >>> Signed-off-by: Wen Congyang <wencongyang@gmail.com> >>> --- >>> migration/colo.c | 17 ++++++++++++++++ >>> qapi-schema.json | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ >>> 2 files changed, 77 insertions(+) >>> >> Reviewed-by: Eric Blake <eblake@redhat.com> > Given that the series is all acked, are you going to take care of the > pull request? > > > . > -- Thanks Zhang Chen ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status 2017-02-16 3:25 ` Zhang Chen @ 2017-02-16 5:08 ` Jason Wang 2017-02-16 5:21 ` Zhang Chen 0 siblings, 1 reply; 19+ messages in thread From: Jason Wang @ 2017-02-16 5:08 UTC (permalink / raw) To: Zhang Chen, Eric Blake Cc: Stefano Stabellini, qemu devel, Wen Congyang, eddie . dong, bian naimeng, Li Zhijian, Juan Quintela, Dr . David Alan Gilbert On 2017年02月16日 11:25, Zhang Chen wrote: > Ping... > > No new for a long time. > > Who can pick up this patch? > I believe you'd better cc migration maintainers (cced), have you tried scripts/get_maintainer ? Thanks > > Thanks > > Zhang Chen > > > On 02/14/2017 04:28 AM, Stefano Stabellini wrote: >> On Wed, 8 Feb 2017, Eric Blake wrote: >>> On 02/07/2017 11:24 PM, Zhang Chen wrote: >>>> We can call this qmp command to do checkpoint outside of qemu. >>>> Xen colo will need this function. >>>> >>>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> >>>> Signed-off-by: Wen Congyang <wencongyang@gmail.com> >>>> --- >>>> migration/colo.c | 17 ++++++++++++++++ >>>> qapi-schema.json | 60 >>>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ >>>> 2 files changed, 77 insertions(+) >>>> >>> Reviewed-by: Eric Blake <eblake@redhat.com> >> Given that the series is all acked, are you going to take care of the >> pull request? >> >> >> . >> > ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status 2017-02-16 5:08 ` Jason Wang @ 2017-02-16 5:21 ` Zhang Chen 0 siblings, 0 replies; 19+ messages in thread From: Zhang Chen @ 2017-02-16 5:21 UTC (permalink / raw) To: Jason Wang, Eric Blake Cc: Stefano Stabellini, qemu devel, Wen Congyang, eddie . dong, bian naimeng, Li Zhijian, Juan Quintela, Dr . David Alan Gilbert, Markus Armbruster, Amit Shah, zhanghailiang On 02/16/2017 01:08 PM, Jason Wang wrote: > > > On 2017年02月16日 11:25, Zhang Chen wrote: >> Ping... >> >> No new for a long time. >> >> Who can pick up this patch? >> > > I believe you'd better cc migration maintainers (cced), have you tried > scripts/get_maintainer ? Thanks Jason. Add cc Markus Armbruster <armbru@redhat.com>, Amit Shah <amit.shah@redhat.com>, zhanghailiang <zhang.zhanghailiang@huawei.com> > > Thanks > >> >> Thanks >> >> Zhang Chen >> >> >> On 02/14/2017 04:28 AM, Stefano Stabellini wrote: >>> On Wed, 8 Feb 2017, Eric Blake wrote: >>>> On 02/07/2017 11:24 PM, Zhang Chen wrote: >>>>> We can call this qmp command to do checkpoint outside of qemu. >>>>> Xen colo will need this function. >>>>> >>>>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> >>>>> Signed-off-by: Wen Congyang <wencongyang@gmail.com> >>>>> --- >>>>> migration/colo.c | 17 ++++++++++++++++ >>>>> qapi-schema.json | 60 >>>>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ >>>>> 2 files changed, 77 insertions(+) >>>>> >>>> Reviewed-by: Eric Blake <eblake@redhat.com> >>> Given that the series is all acked, are you going to take care of the >>> pull request? >>> >>> >>> . >>> >> > > > > . > -- Thanks Zhang Chen ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status 2017-02-08 5:24 ` [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status Zhang Chen 2017-02-08 21:35 ` Eric Blake @ 2017-02-21 11:15 ` Markus Armbruster 2017-02-21 12:24 ` Zhang Chen 2017-02-21 13:01 ` Hailiang Zhang 2 siblings, 1 reply; 19+ messages in thread From: Markus Armbruster @ 2017-02-21 11:15 UTC (permalink / raw) To: Zhang Chen Cc: qemu devel, Eric Blake, Li Zhijian, Jason Wang, eddie . dong, Wen Congyang, bian naimeng Zhang Chen <zhangchen.fnst@cn.fujitsu.com> writes: > We can call this qmp command to do checkpoint outside of qemu. > Xen colo will need this function. I know nothing about "Xen colo", but I'll try anyway. I *guess* "Xen colo" is a long-running activity, and the new commands interact with it. Correct? > > Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> > Signed-off-by: Wen Congyang <wencongyang@gmail.com> > --- > migration/colo.c | 17 ++++++++++++++++ > qapi-schema.json | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 77 insertions(+) > > diff --git a/migration/colo.c b/migration/colo.c > index 6fc2ade..2f98a33 100644 > --- a/migration/colo.c > +++ b/migration/colo.c > @@ -127,6 +127,23 @@ void qmp_xen_set_replication(bool enable, bool primary, > } > } > > +ReplicationResult *qmp_query_xen_replication_status(Error **errp) > +{ > + Error *err = NULL; > + ReplicationResult *result = g_new0(ReplicationResult, 1); > + replication_get_error_all(&err); > + result->status = err ? > + REPLICATION_STATUS_ERROR : > + REPLICATION_STATUS_NORMAL; Reports only that there is an error, throws away the actual error message. Naive question: could the error message be good to know for the QMP user? > + error_free(err); > + return result; > +} > + > +void qmp_xen_do_checkpoint(Error **errp) > +{ > + replication_do_checkpoint_all(errp); > +} > + > static void colo_send_message(QEMUFile *f, COLOMessage msg, > Error **errp) > { > diff --git a/qapi-schema.json b/qapi-schema.json > index 9445b93..719744a 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -5931,6 +5931,66 @@ > 'data': { 'enable': 'bool', 'primary': 'bool', '*failover' : 'bool' } } > > ## > +# @ReplicationStatus: > +# > +# Describe the status of replication. > +# > +# @error: Replication has an error. > +# > +# @normal: Replication is running normally. > +# > +# Since: 2.9 > +## > +{ 'enum': 'ReplicationStatus', > + 'data': [ 'error', 'normal' ] } Do you expect more status values in the future? If yes, what should clients do when they see a status value they don't know? If no, why not simply use bool? > + > +## > +# @ReplicationResult: > +# > +# The result format for 'query-xen-replication-status'. > +# > +# @status: enum of @ReplicationStatus, which shows current > +# replication error status > +# > +# Since: 2.9 > +## > +{ 'struct': 'ReplicationResult', > + 'data': { 'status': 'ReplicationStatus'} } > + > +## > +# @query-xen-replication-status: > +# > +# Query replication status while the vm is running. > +# > +# Returns: A @ReplicationResult objects showing the status. > +# > +# Example: > +# > +# -> { "execute": "query-xen-replication-status" } > +# <- { "return": { "status": "normal" } } > +# > +# Since: 2.9 > +## > +{ 'command': 'query-xen-replication-status', > + 'returns': 'ReplicationResult' } The naming is a bit unfortunate: query-xen-replication-status returns ReplicationResult, which contains ReplicationStatus. > + > +## > +# @xen-do-checkpoint: > +# > +# Xen uses this command to notify replication to trigger a checkpoint. > +# > +# Returns: nothing. > +# > +# Example: > +# > +# -> { "execute": "xen-do-checkpoint" } > +# <- { "return": {} } > +# > +# Since: 2.9 > +## > +{ 'command': 'xen-do-checkpoint' } > + > +## > # @GICCapability: > # > # The struct describes capability for a specific GIC (Generic ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status 2017-02-21 11:15 ` Markus Armbruster @ 2017-02-21 12:24 ` Zhang Chen 2017-02-21 14:07 ` Markus Armbruster 0 siblings, 1 reply; 19+ messages in thread From: Zhang Chen @ 2017-02-21 12:24 UTC (permalink / raw) To: Markus Armbruster Cc: zhangchen.fnst, qemu devel, Eric Blake, Li Zhijian, Jason Wang, eddie . dong, Wen Congyang, bian naimeng On 02/21/2017 07:15 PM, Markus Armbruster wrote: > Zhang Chen <zhangchen.fnst@cn.fujitsu.com> writes: > >> We can call this qmp command to do checkpoint outside of qemu. >> Xen colo will need this function. > I know nothing about "Xen colo", but I'll try anyway. > > I *guess* "Xen colo" is a long-running activity, and the new commands > interact with it. Correct? Yes, you are right. By the way this patch has been reviewed by Eric black. https://lists.nongnu.org/archive/html/qemu-devel/2017-02/msg03435.html > >> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> >> Signed-off-by: Wen Congyang <wencongyang@gmail.com> >> --- >> migration/colo.c | 17 ++++++++++++++++ >> qapi-schema.json | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 77 insertions(+) >> >> diff --git a/migration/colo.c b/migration/colo.c >> index 6fc2ade..2f98a33 100644 >> --- a/migration/colo.c >> +++ b/migration/colo.c >> @@ -127,6 +127,23 @@ void qmp_xen_set_replication(bool enable, bool primary, >> } >> } >> >> +ReplicationResult *qmp_query_xen_replication_status(Error **errp) >> +{ >> + Error *err = NULL; >> + ReplicationResult *result = g_new0(ReplicationResult, 1); >> + replication_get_error_all(&err); >> + result->status = err ? >> + REPLICATION_STATUS_ERROR : >> + REPLICATION_STATUS_NORMAL; > Reports only that there is an error, throws away the actual error > message. Naive question: could the error message be good to know for > the QMP user? Yes, Xen colo will handle it. > >> + error_free(err); >> + return result; >> +} >> + >> +void qmp_xen_do_checkpoint(Error **errp) >> +{ >> + replication_do_checkpoint_all(errp); >> +} >> + >> static void colo_send_message(QEMUFile *f, COLOMessage msg, >> Error **errp) >> { >> diff --git a/qapi-schema.json b/qapi-schema.json >> index 9445b93..719744a 100644 >> --- a/qapi-schema.json >> +++ b/qapi-schema.json >> @@ -5931,6 +5931,66 @@ >> 'data': { 'enable': 'bool', 'primary': 'bool', '*failover' : 'bool' } } >> >> ## >> +# @ReplicationStatus: >> +# >> +# Describe the status of replication. >> +# >> +# @error: Replication has an error. >> +# >> +# @normal: Replication is running normally. >> +# >> +# Since: 2.9 >> +## >> +{ 'enum': 'ReplicationStatus', >> + 'data': [ 'error', 'normal' ] } > Do you expect more status values in the future? > > If yes, what should clients do when they see a status value they don't > know? We will add other status for it, now, that's enough. > > If no, why not simply use bool? > >> + >> +## >> +# @ReplicationResult: >> +# >> +# The result format for 'query-xen-replication-status'. >> +# >> +# @status: enum of @ReplicationStatus, which shows current >> +# replication error status >> +# >> +# Since: 2.9 >> +## >> +{ 'struct': 'ReplicationResult', >> + 'data': { 'status': 'ReplicationStatus'} } >> + >> +## >> +# @query-xen-replication-status: >> +# >> +# Query replication status while the vm is running. >> +# >> +# Returns: A @ReplicationResult objects showing the status. >> +# >> +# Example: >> +# >> +# -> { "execute": "query-xen-replication-status" } >> +# <- { "return": { "status": "normal" } } >> +# >> +# Since: 2.9 >> +## >> +{ 'command': 'query-xen-replication-status', >> + 'returns': 'ReplicationResult' } > The naming is a bit unfortunate: query-xen-replication-status returns > ReplicationResult, which contains ReplicationStatus. I will change the name in next version. Thanks Zhang Chen > >> + >> +## >> +# @xen-do-checkpoint: >> +# >> +# Xen uses this command to notify replication to trigger a checkpoint. >> +# >> +# Returns: nothing. >> +# >> +# Example: >> +# >> +# -> { "execute": "xen-do-checkpoint" } >> +# <- { "return": {} } >> +# >> +# Since: 2.9 >> +## >> +{ 'command': 'xen-do-checkpoint' } >> + >> +## >> # @GICCapability: >> # >> # The struct describes capability for a specific GIC (Generic > > . > -- Thanks Zhang Chen ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status 2017-02-21 12:24 ` Zhang Chen @ 2017-02-21 14:07 ` Markus Armbruster 2017-02-21 16:20 ` Eric Blake 0 siblings, 1 reply; 19+ messages in thread From: Markus Armbruster @ 2017-02-21 14:07 UTC (permalink / raw) To: Zhang Chen Cc: Li Zhijian, Jason Wang, eddie . dong, qemu devel, Wen Congyang, bian naimeng Zhang Chen <zhangchen.fnst@cn.fujitsu.com> writes: > On 02/21/2017 07:15 PM, Markus Armbruster wrote: >> Zhang Chen <zhangchen.fnst@cn.fujitsu.com> writes: >> >>> We can call this qmp command to do checkpoint outside of qemu. >>> Xen colo will need this function. >> I know nothing about "Xen colo", but I'll try anyway. >> >> I *guess* "Xen colo" is a long-running activity, and the new commands >> interact with it. Correct? > > Yes, you are right. We need to build a generic framework for interacting with long-running activities. But asking you to wait for it wouldn't be fair. > By the way this patch has been reviewed by Eric black. > > https://lists.nongnu.org/archive/html/qemu-devel/2017-02/msg03435.html > > > >> >>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> >>> Signed-off-by: Wen Congyang <wencongyang@gmail.com> >>> --- >>> migration/colo.c | 17 ++++++++++++++++ >>> qapi-schema.json | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ >>> 2 files changed, 77 insertions(+) >>> >>> diff --git a/migration/colo.c b/migration/colo.c >>> index 6fc2ade..2f98a33 100644 >>> --- a/migration/colo.c >>> +++ b/migration/colo.c >>> @@ -127,6 +127,23 @@ void qmp_xen_set_replication(bool enable, bool primary, >>> } >>> } >>> +ReplicationResult *qmp_query_xen_replication_status(Error >>> **errp) >>> +{ >>> + Error *err = NULL; >>> + ReplicationResult *result = g_new0(ReplicationResult, 1); >>> + replication_get_error_all(&err); >>> + result->status = err ? >>> + REPLICATION_STATUS_ERROR : >>> + REPLICATION_STATUS_NORMAL; >> Reports only that there is an error, throws away the actual error >> message. Naive question: could the error message be good to know for >> the QMP user? > > Yes, Xen colo will handle it. Is that "yes, the QMP user could use the error message, but we're not giving it to him regardless", or "no, the QMP user does not need to know, and that's because we don't give it to him"? Even if we want QMP clients to treat all errors the same, transmitting the error message can still be useful for troubleshooting. QMP itself does that. Quoting qmp-spec.txt: 2.4.2 error ----------- The format of an error response is: { "error": { "class": json-string, "desc": json-string }, "id": json-value } Where, - The "class" member contains the error class name (eg. "GenericError") --> - The "desc" member is a human-readable error message. Clients should --> not attempt to parse this message. - The "id" member contains the transaction identification associated with the command execution if issued by the Client >>> + error_free(err); >>> + return result; >>> +} >>> + >>> +void qmp_xen_do_checkpoint(Error **errp) >>> +{ >>> + replication_do_checkpoint_all(errp); >>> +} >>> + >>> static void colo_send_message(QEMUFile *f, COLOMessage msg, >>> Error **errp) >>> { >>> diff --git a/qapi-schema.json b/qapi-schema.json >>> index 9445b93..719744a 100644 >>> --- a/qapi-schema.json >>> +++ b/qapi-schema.json >>> @@ -5931,6 +5931,66 @@ >>> 'data': { 'enable': 'bool', 'primary': 'bool', '*failover' : 'bool' } } >>> ## >>> +# @ReplicationStatus: >>> +# >>> +# Describe the status of replication. >>> +# >>> +# @error: Replication has an error. >>> +# >>> +# @normal: Replication is running normally. >>> +# >>> +# Since: 2.9 >>> +## >>> +{ 'enum': 'ReplicationStatus', >>> + 'data': [ 'error', 'normal' ] } >> Do you expect more status values in the future? >> >> If yes, what should clients do when they see a status value they don't >> know? > > We will add other status for it, now, that's enough. What should a QMP client do when it sees a ReplicationStatus value other than 'error' and 'normal'? You need to provide some guidance, or else you won't be able to add status values without breaking clients! >> If no, why not simply use bool? >> >>> + >>> +## >>> +# @ReplicationResult: >>> +# >>> +# The result format for 'query-xen-replication-status'. >>> +# >>> +# @status: enum of @ReplicationStatus, which shows current >>> +# replication error status >>> +# >>> +# Since: 2.9 >>> +## >>> +{ 'struct': 'ReplicationResult', >>> + 'data': { 'status': 'ReplicationStatus'} } >>> + >>> +## >>> +# @query-xen-replication-status: >>> +# >>> +# Query replication status while the vm is running. >>> +# >>> +# Returns: A @ReplicationResult objects showing the status. >>> +# >>> +# Example: >>> +# >>> +# -> { "execute": "query-xen-replication-status" } >>> +# <- { "return": { "status": "normal" } } >>> +# >>> +# Since: 2.9 >>> +## >>> +{ 'command': 'query-xen-replication-status', >>> + 'returns': 'ReplicationResult' } >> The naming is a bit unfortunate: query-xen-replication-status returns >> ReplicationResult, which contains ReplicationStatus. > > I will change the name in next version. > > Thanks > Zhang Chen > >> >>> + >>> +## >>> +# @xen-do-checkpoint: >>> +# >>> +# Xen uses this command to notify replication to trigger a checkpoint. >>> +# >>> +# Returns: nothing. >>> +# >>> +# Example: >>> +# >>> +# -> { "execute": "xen-do-checkpoint" } >>> +# <- { "return": {} } >>> +# >>> +# Since: 2.9 >>> +## >>> +{ 'command': 'xen-do-checkpoint' } >>> + >>> +## >>> # @GICCapability: >>> # >>> # The struct describes capability for a specific GIC (Generic >> >> . >> ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status 2017-02-21 14:07 ` Markus Armbruster @ 2017-02-21 16:20 ` Eric Blake 2017-02-22 7:54 ` Zhang Chen 0 siblings, 1 reply; 19+ messages in thread From: Eric Blake @ 2017-02-21 16:20 UTC (permalink / raw) To: Markus Armbruster, Zhang Chen Cc: Li Zhijian, Jason Wang, eddie . dong, qemu devel, Wen Congyang, bian naimeng [-- Attachment #1: Type: text/plain, Size: 3279 bytes --] On 02/21/2017 08:07 AM, Markus Armbruster wrote: > Zhang Chen <zhangchen.fnst@cn.fujitsu.com> writes: > >> On 02/21/2017 07:15 PM, Markus Armbruster wrote: >>> Zhang Chen <zhangchen.fnst@cn.fujitsu.com> writes: >>> >>>> We can call this qmp command to do checkpoint outside of qemu. >>>> Xen colo will need this function. >>> I know nothing about "Xen colo", but I'll try anyway. >>> >>> I *guess* "Xen colo" is a long-running activity, and the new commands >>> interact with it. Correct? >> >> Yes, you are right. > > We need to build a generic framework for interacting with long-running > activities. But asking you to wait for it wouldn't be fair. > >> By the way this patch has been reviewed by Eric black. >> >> https://lists.nongnu.org/archive/html/qemu-devel/2017-02/msg03435.html Blake, but you're not the first to mis-type it. >>>> +{ >>>> + Error *err = NULL; >>>> + ReplicationResult *result = g_new0(ReplicationResult, 1); >>>> + replication_get_error_all(&err); >>>> + result->status = err ? >>>> + REPLICATION_STATUS_ERROR : >>>> + REPLICATION_STATUS_NORMAL; >>> Reports only that there is an error, throws away the actual error >>> message. Naive question: could the error message be good to know for >>> the QMP user? >> >> Yes, Xen colo will handle it. > > Is that "yes, the QMP user could use the error message, but we're not > giving it to him regardless", or "no, the QMP user does not need to > know, and that's because we don't give it to him"? > > Even if we want QMP clients to treat all errors the same, transmitting > the error message can still be useful for troubleshooting. Ah, as in: if (err) { result->status = REPLICATION_STATUS_ERROR; result->has_desc = true; result->desc = ...extract string from err } else { result->status = REPLICATION_STATUS_NORMAL; } by modifying the JSON [1] >>>> +## >>>> +{ 'enum': 'ReplicationStatus', >>>> + 'data': [ 'error', 'normal' ] } >>> Do you expect more status values in the future? >>> >>> If yes, what should clients do when they see a status value they don't >>> know? >> >> We will add other status for it, now, that's enough. > > What should a QMP client do when it sees a ReplicationStatus value other > than 'error' and 'normal'? > > You need to provide some guidance, or else you won't be able to add > status values without breaking clients! > >>> If no, why not simply use bool? Off-hand, what other states do you envision adding? >>> >>>> + >>>> +## >>>> +# @ReplicationResult: >>>> +# >>>> +# The result format for 'query-xen-replication-status'. >>>> +# >>>> +# @status: enum of @ReplicationStatus, which shows current >>>> +# replication error status >>>> +# >>>> +# Since: 2.9 >>>> +## >>>> +{ 'struct': 'ReplicationResult', >>>> + 'data': { 'status': 'ReplicationStatus'} } [1] the modification would be: 'data': { 'status': 'ReplicationStatus', '*desc': 'str' } with documentation that @desc is #optional, is only for human consumption, and is only present when @status indicates an error. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 604 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status 2017-02-21 16:20 ` Eric Blake @ 2017-02-22 7:54 ` Zhang Chen 2017-02-22 15:23 ` Eric Blake 0 siblings, 1 reply; 19+ messages in thread From: Zhang Chen @ 2017-02-22 7:54 UTC (permalink / raw) To: Eric Blake, Markus Armbruster Cc: zhangchen.fnst, Li Zhijian, Jason Wang, eddie . dong, qemu devel, Wen Congyang, bian naimeng On 02/22/2017 12:20 AM, Eric Blake wrote: > On 02/21/2017 08:07 AM, Markus Armbruster wrote: >> Zhang Chen <zhangchen.fnst@cn.fujitsu.com> writes: >> >>> On 02/21/2017 07:15 PM, Markus Armbruster wrote: >>>> Zhang Chen <zhangchen.fnst@cn.fujitsu.com> writes: >>>> >>>>> We can call this qmp command to do checkpoint outside of qemu. >>>>> Xen colo will need this function. >>>> I know nothing about "Xen colo", but I'll try anyway. >>>> >>>> I *guess* "Xen colo" is a long-running activity, and the new commands >>>> interact with it. Correct? >>> Yes, you are right. >> We need to build a generic framework for interacting with long-running >> activities. But asking you to wait for it wouldn't be fair. >> >>> By the way this patch has been reviewed by Eric black. >>> >>> https://lists.nongnu.org/archive/html/qemu-devel/2017-02/msg03435.html > Blake, but you're not the first to mis-type it. I'm very sorry about this typo. =_=!. > >>>>> +{ >>>>> + Error *err = NULL; >>>>> + ReplicationResult *result = g_new0(ReplicationResult, 1); >>>>> + replication_get_error_all(&err); >>>>> + result->status = err ? >>>>> + REPLICATION_STATUS_ERROR : >>>>> + REPLICATION_STATUS_NORMAL; >>>> Reports only that there is an error, throws away the actual error >>>> message. Naive question: could the error message be good to know for >>>> the QMP user? >>> Yes, Xen colo will handle it. >> Is that "yes, the QMP user could use the error message, but we're not >> giving it to him regardless", or "no, the QMP user does not need to >> know, and that's because we don't give it to him"? >> >> Even if we want QMP clients to treat all errors the same, transmitting >> the error message can still be useful for troubleshooting. > Ah, as in: > > if (err) { > result->status = REPLICATION_STATUS_ERROR; > result->has_desc = true; > result->desc = ...extract string from err > } else { > result->status = REPLICATION_STATUS_NORMAL; > } > > by modifying the JSON [1] I got your point, but I don't understand this: result->desc = ...extract string from err Where we can get the string from err? Can you give me a example? > >>>>> +## >>>>> +{ 'enum': 'ReplicationStatus', >>>>> + 'data': [ 'error', 'normal' ] } >>>> Do you expect more status values in the future? >>>> >>>> If yes, what should clients do when they see a status value they don't >>>> know? >>> We will add other status for it, now, that's enough. >> What should a QMP client do when it sees a ReplicationStatus value other >> than 'error' and 'normal'? >> >> You need to provide some guidance, or else you won't be able to add >> status values without breaking clients! >> >>>> If no, why not simply use bool? > Off-hand, what other states do you envision adding? OK, I will change it to bool in next version. > >>>>> + >>>>> +## >>>>> +# @ReplicationResult: >>>>> +# >>>>> +# The result format for 'query-xen-replication-status'. >>>>> +# >>>>> +# @status: enum of @ReplicationStatus, which shows current >>>>> +# replication error status >>>>> +# >>>>> +# Since: 2.9 >>>>> +## >>>>> +{ 'struct': 'ReplicationResult', >>>>> + 'data': { 'status': 'ReplicationStatus'} } > [1] the modification would be: > > 'data': { 'status': 'ReplicationStatus', '*desc': 'str' } > > with documentation that @desc is #optional, is only for human > consumption, and is only present when @status indicates an error. I don't know how to get the 'desc'. Please tell me. Thanks Zhang Chen > -- Thanks Zhang Chen ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status 2017-02-22 7:54 ` Zhang Chen @ 2017-02-22 15:23 ` Eric Blake 2017-02-23 6:06 ` Zhang Chen 0 siblings, 1 reply; 19+ messages in thread From: Eric Blake @ 2017-02-22 15:23 UTC (permalink / raw) To: Zhang Chen, Markus Armbruster Cc: Li Zhijian, Jason Wang, eddie . dong, qemu devel, Wen Congyang, bian naimeng [-- Attachment #1: Type: text/plain, Size: 960 bytes --] On 02/22/2017 01:54 AM, Zhang Chen wrote: >> if (err) { >> result->status = REPLICATION_STATUS_ERROR; >> result->has_desc = true; >> result->desc = ...extract string from err >> } else { >> result->status = REPLICATION_STATUS_NORMAL; >> } >> >> by modifying the JSON [1] > > I got your point, but I don't understand this: > > result->desc = ...extract string from err > > Where we can get the string from err? > Can you give me a example? See qmp_query_migrate (migration/migration.c) for similar code that populates an optional description member when an error is present: case MIGRATION_STATUS_FAILED: info->has_status = true; if (s->error) { info->has_error_desc = true; info->error_desc = g_strdup(error_get_pretty(s->error)); } break; -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 604 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status 2017-02-22 15:23 ` Eric Blake @ 2017-02-23 6:06 ` Zhang Chen 0 siblings, 0 replies; 19+ messages in thread From: Zhang Chen @ 2017-02-23 6:06 UTC (permalink / raw) To: Eric Blake, Markus Armbruster Cc: zhangchen.fnst, Li Zhijian, Jason Wang, eddie . dong, qemu devel, Wen Congyang, bian naimeng On 02/22/2017 11:23 PM, Eric Blake wrote: > On 02/22/2017 01:54 AM, Zhang Chen wrote: > >>> if (err) { >>> result->status = REPLICATION_STATUS_ERROR; >>> result->has_desc = true; >>> result->desc = ...extract string from err >>> } else { >>> result->status = REPLICATION_STATUS_NORMAL; >>> } >>> >>> by modifying the JSON [1] >> I got your point, but I don't understand this: >> >> result->desc = ...extract string from err >> >> Where we can get the string from err? >> Can you give me a example? > See qmp_query_migrate (migration/migration.c) for similar code that > populates an optional description member when an error is present: > > case MIGRATION_STATUS_FAILED: > info->has_status = true; > if (s->error) { > info->has_error_desc = true; > info->error_desc = g_strdup(error_get_pretty(s->error)); > } > break; I will fix it in next version. Thanks Zhang Chen > -- Thanks Zhang Chen ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status 2017-02-08 5:24 ` [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status Zhang Chen 2017-02-08 21:35 ` Eric Blake 2017-02-21 11:15 ` Markus Armbruster @ 2017-02-21 13:01 ` Hailiang Zhang 2017-02-21 13:16 ` Zhang Chen 2 siblings, 1 reply; 19+ messages in thread From: Hailiang Zhang @ 2017-02-21 13:01 UTC (permalink / raw) To: Zhang Chen, qemu devel, Eric Blake Cc: xuquan8, Li Zhijian, Jason Wang, eddie . dong, Wen Congyang, bian naimeng On 2017/2/8 13:24, Zhang Chen wrote: > We can call this qmp command to do checkpoint outside of qemu. > Xen colo will need this function. > > Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> > Signed-off-by: Wen Congyang <wencongyang@gmail.com> > --- > migration/colo.c | 17 ++++++++++++++++ > qapi-schema.json | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 77 insertions(+) > > diff --git a/migration/colo.c b/migration/colo.c > index 6fc2ade..2f98a33 100644 > --- a/migration/colo.c > +++ b/migration/colo.c > @@ -127,6 +127,23 @@ void qmp_xen_set_replication(bool enable, bool primary, > } > } > > +ReplicationResult *qmp_query_xen_replication_status(Error **errp) > +{ > + Error *err = NULL; > + ReplicationResult *result = g_new0(ReplicationResult, 1); Indent, line break. > + replication_get_error_all(&err); > + result->status = err ? > + REPLICATION_STATUS_ERROR : > + REPLICATION_STATUS_NORMAL; > + error_free(err); > + return result; > +} > + > +void qmp_xen_do_checkpoint(Error **errp) > +{ > + replication_do_checkpoint_all(errp); > +} > + > static void colo_send_message(QEMUFile *f, COLOMessage msg, > Error **errp) > { > diff --git a/qapi-schema.json b/qapi-schema.json > index 9445b93..719744a 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -5931,6 +5931,66 @@ > 'data': { 'enable': 'bool', 'primary': 'bool', '*failover' : 'bool' } } > > ## > +# @ReplicationStatus: > +# > +# Describe the status of replication. > +# > +# @error: Replication has an error. > +# > +# @normal: Replication is running normally. > +# > +# Since: 2.9 > +## > +{ 'enum': 'ReplicationStatus', > + 'data': [ 'error', 'normal' ] } > + > +## > +# @ReplicationResult: > +# > +# The result format for 'query-xen-replication-status'. > +# > +# @status: enum of @ReplicationStatus, which shows current > +# replication error status > +# > +# Since: 2.9 > +## > +{ 'struct': 'ReplicationResult', > + 'data': { 'status': 'ReplicationStatus'} } ^ Space > + > +## > +# @query-xen-replication-status: > +# > +# Query replication status while the vm is running. > +# > +# Returns: A @ReplicationResult objects showing the status. > +# > +# Example: > +# > +# -> { "execute": "query-xen-replication-status" } > +# <- { "return": { "status": "normal" } } > +# > +# Since: 2.9 > +## > +{ 'command': 'query-xen-replication-status', > + 'returns': 'ReplicationResult' } > + > +## > +# @xen-do-checkpoint: > +# Maybe use the name 'xen-checkpoint-notify' or 'xen-colo-checkpoint-notify' ? > +# Xen uses this command to notify replication to trigger a checkpoint. > +# > +# Returns: nothing. > +# > +# Example: > +# > +# -> { "execute": "xen-do-checkpoint" } > +# <- { "return": {} } > +# > +# Since: 2.9 > +## > +{ 'command': 'xen-do-checkpoint' } > + > +## > # @GICCapability: > # > # The struct describes capability for a specific GIC (Generic > ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status 2017-02-21 13:01 ` Hailiang Zhang @ 2017-02-21 13:16 ` Zhang Chen 0 siblings, 0 replies; 19+ messages in thread From: Zhang Chen @ 2017-02-21 13:16 UTC (permalink / raw) To: Hailiang Zhang, qemu devel, Eric Blake Cc: zhangchen.fnst, xuquan8, Li Zhijian, Jason Wang, eddie . dong, Wen Congyang, bian naimeng On 02/21/2017 09:01 PM, Hailiang Zhang wrote: > On 2017/2/8 13:24, Zhang Chen wrote: >> We can call this qmp command to do checkpoint outside of qemu. >> Xen colo will need this function. >> >> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> >> Signed-off-by: Wen Congyang <wencongyang@gmail.com> >> --- >> migration/colo.c | 17 ++++++++++++++++ >> qapi-schema.json | 60 >> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 77 insertions(+) >> >> diff --git a/migration/colo.c b/migration/colo.c >> index 6fc2ade..2f98a33 100644 >> --- a/migration/colo.c >> +++ b/migration/colo.c >> @@ -127,6 +127,23 @@ void qmp_xen_set_replication(bool enable, bool >> primary, >> } >> } >> >> +ReplicationResult *qmp_query_xen_replication_status(Error **errp) >> +{ >> + Error *err = NULL; >> + ReplicationResult *result = g_new0(ReplicationResult, 1); > > Indent, line break. OK~~ will fix in next version. > >> + replication_get_error_all(&err); >> + result->status = err ? >> + REPLICATION_STATUS_ERROR : >> + REPLICATION_STATUS_NORMAL; >> + error_free(err); >> + return result; >> +} >> + >> +void qmp_xen_do_checkpoint(Error **errp) >> +{ >> + replication_do_checkpoint_all(errp); >> +} >> + >> static void colo_send_message(QEMUFile *f, COLOMessage msg, >> Error **errp) >> { >> diff --git a/qapi-schema.json b/qapi-schema.json >> index 9445b93..719744a 100644 >> --- a/qapi-schema.json >> +++ b/qapi-schema.json >> @@ -5931,6 +5931,66 @@ >> 'data': { 'enable': 'bool', 'primary': 'bool', '*failover' : >> 'bool' } } >> >> ## >> +# @ReplicationStatus: >> +# >> +# Describe the status of replication. >> +# >> +# @error: Replication has an error. >> +# >> +# @normal: Replication is running normally. >> +# >> +# Since: 2.9 >> +## >> +{ 'enum': 'ReplicationStatus', >> + 'data': [ 'error', 'normal' ] } >> + >> +## >> +# @ReplicationResult: >> +# >> +# The result format for 'query-xen-replication-status'. >> +# >> +# @status: enum of @ReplicationStatus, which shows current >> +# replication error status >> +# >> +# Since: 2.9 >> +## >> +{ 'struct': 'ReplicationResult', >> + 'data': { 'status': 'ReplicationStatus'} } > ^ Space OK. > >> + >> +## >> +# @query-xen-replication-status: >> +# >> +# Query replication status while the vm is running. >> +# >> +# Returns: A @ReplicationResult objects showing the status. >> +# >> +# Example: >> +# >> +# -> { "execute": "query-xen-replication-status" } >> +# <- { "return": { "status": "normal" } } >> +# >> +# Since: 2.9 >> +## >> +{ 'command': 'query-xen-replication-status', >> + 'returns': 'ReplicationResult' } >> + >> +## >> +# @xen-do-checkpoint: >> +# > > Maybe use the name 'xen-checkpoint-notify' or > 'xen-colo-checkpoint-notify' ? I will change the name to 'xen-colo-checkpoint-notify'. Thank Zhang Chen > >> +# Xen uses this command to notify replication to trigger a checkpoint. >> +# >> +# Returns: nothing. >> +# >> +# Example: >> +# >> +# -> { "execute": "xen-do-checkpoint" } >> +# <- { "return": {} } >> +# >> +# Since: 2.9 >> +## >> +{ 'command': 'xen-do-checkpoint' } >> + >> +## >> # @GICCapability: >> # >> # The struct describes capability for a specific GIC (Generic >> > > > > . > -- Thanks Zhang Chen ^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2017-02-23 6:06 UTC | newest] Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-02-08 5:24 [Qemu-devel] [PATCH V7 0/2] Add new qmp commands to suppurt Xen COLO Zhang Chen 2017-02-08 5:24 ` [Qemu-devel] [PATCH V7 1/2] Add a new qmp command to start/stop replication Zhang Chen 2017-02-21 12:53 ` Hailiang Zhang 2017-02-08 5:24 ` [Qemu-devel] [PATCH V7 2/2] Add a new qmp command to do checkpoint, query xen replication status Zhang Chen 2017-02-08 21:35 ` Eric Blake 2017-02-09 2:03 ` Zhang Chen 2017-02-13 20:28 ` Stefano Stabellini 2017-02-16 3:25 ` Zhang Chen 2017-02-16 5:08 ` Jason Wang 2017-02-16 5:21 ` Zhang Chen 2017-02-21 11:15 ` Markus Armbruster 2017-02-21 12:24 ` Zhang Chen 2017-02-21 14:07 ` Markus Armbruster 2017-02-21 16:20 ` Eric Blake 2017-02-22 7:54 ` Zhang Chen 2017-02-22 15:23 ` Eric Blake 2017-02-23 6:06 ` Zhang Chen 2017-02-21 13:01 ` Hailiang Zhang 2017-02-21 13:16 ` Zhang Chen
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.