[Qemu-devel] [PATCH V6 0/2] Add new qmp commands to suppurt Xen COLO

[Qemu-devel] [PATCH V6 0/2] Add new qmp commands to suppurt Xen COLO

[Zhang Chen]

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

 docs/qmp-commands.txt | 42 +++++++++++++++++++++++++++++++
 migration/colo.c      | 40 +++++++++++++++++++++++++++++
 qapi-schema.json      | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 151 insertions(+)

-- 
2.7.4

[Qemu-devel] [PATCH V6 1/2] Add a new qmp command to start/stop replication

[Zhang Chen]

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>

---
 docs/qmp-commands.txt | 18 ++++++++++++++++++
 migration/colo.c      | 23 +++++++++++++++++++++++
 qapi-schema.json      | 19 +++++++++++++++++++
 3 files changed, 60 insertions(+)

diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt
index abf210a..d182147 100644
--- a/docs/qmp-commands.txt
+++ b/docs/qmp-commands.txt
@@ -432,6 +432,24 @@ Example:
      "arguments": { "enable": true } }
 <- { "return": {} }
 
+xen-set-replication
+-------------------
+
+Enable or disable replication.
+
+Arguments:
+
+- "enable": Enable it or disable it.
+- "primary": True for primary or false for secondary.
+- "failover": Enable failover when stopping replication, but cannot be
+              specified if 'enable' is true (optional, default false).
+
+Example:
+
+-> { "execute": "xen-set-replication",
+     "arguments": {"enable": true, "primary": false} }
+<- { "return": {} }
+
 migrate
 -------
 
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 f3e9bfc..78802f4 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -4676,6 +4676,25 @@
 { '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.
+#
+# 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

[Qemu-devel] [PATCH V6 2/2] Add a new qmp command to do checkpoint, query xen replication status

[Zhang Chen]

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>
---
 docs/qmp-commands.txt | 24 ++++++++++++++++++++++++
 migration/colo.c      | 17 +++++++++++++++++
 qapi-schema.json      | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 91 insertions(+)

diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt
index d182147..0ed6cf4 100644
--- a/docs/qmp-commands.txt
+++ b/docs/qmp-commands.txt
@@ -450,6 +450,30 @@ Example:
      "arguments": {"enable": true, "primary": false} }
 <- { "return": {} }
 
+query-xen-replication-status
+----------------------------
+
+Query replication status when vm is running.
+
+Arguments: None.
+
+Example:
+
+-> { "execute": "query-xen-replication-status" }
+<- { "return": { "status": "normal" } }
+
+xen-do-checkpoint
+-----------------
+
+Xen uses this command to notify replication to trigger a checkpoint.
+
+Arguments: None.
+
+Example:
+
+-> { "execute": "xen-do-checkpoint" }
+<- { "return": {} }
+
 migrate
 -------
 
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 78802f4..f23c657 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -4695,6 +4695,56 @@
   '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.
+#
+# Since: 2.9
+##
+{ 'command': 'query-xen-replication-status',
+  'returns': 'ReplicationResult' }
+
+##
+# @xen-do-checkpoint
+#
+# Xen uses this command to notify replication to do checkpoint.
+#
+# Returns: nothing.
+#
+# Since: 2.9
+##
+{ 'command': 'xen-do-checkpoint' }
+
+##
 # @GICCapability:
 #
 # The struct describes capability for a specific GIC (Generic
-- 
2.7.4

Re: [Qemu-devel] [PATCH V6 0/2] Add new qmp commands to suppurt Xen COLO

[Zhang Chen]

Hi~~

Anyone have any comments?

Ping....


Thanks

Zhang Chen


On 01/05/2017 02:08 PM, Zhang Chen wrote:
> 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
>
>   docs/qmp-commands.txt | 42 +++++++++++++++++++++++++++++++
>   migration/colo.c      | 40 +++++++++++++++++++++++++++++
>   qapi-schema.json      | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++
>   3 files changed, 151 insertions(+)
>

-- 
Thanks
Zhang Chen

Re: [Qemu-devel] [PATCH V6 0/2] Add new qmp commands to suppurt Xen COLO

[Zhang Chen]

Hi~

No news for a week.

We need comments ~~

Ping...


Thanks

Zhang Chen


On 01/19/2017 05:57 PM, Zhang Chen wrote:
> Hi~~
>
> Anyone have any comments?
>
> Ping....
>
>
> Thanks
>
> Zhang Chen
>
>
> On 01/05/2017 02:08 PM, Zhang Chen wrote:
>> 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
>>
>>   docs/qmp-commands.txt | 42 +++++++++++++++++++++++++++++++
>>   migration/colo.c      | 40 +++++++++++++++++++++++++++++
>>   qapi-schema.json      | 69 
>> +++++++++++++++++++++++++++++++++++++++++++++++++++
>>   3 files changed, 151 insertions(+)
>>
>

-- 
Thanks
Zhang Chen

Re: [Qemu-devel] [PATCH V6 0/2] Add new qmp commands to suppurt Xen COLO

[Jason Wang]

On 2017年01月26日 11:04, Zhang Chen wrote:
> Hi~
>
> No news for a week.
>
> We need comments ~~
>
> Ping...
>

Cc David who is one of the maintainer of migration.


>
> Thanks
>
> Zhang Chen
>
>
> On 01/19/2017 05:57 PM, Zhang Chen wrote:
>> Hi~~
>>
>> Anyone have any comments?
>>
>> Ping....
>>
>>
>> Thanks
>>
>> Zhang Chen
>>
>>
>> On 01/05/2017 02:08 PM, Zhang Chen wrote:
>>> 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
>>>
>>>   docs/qmp-commands.txt | 42 +++++++++++++++++++++++++++++++
>>>   migration/colo.c      | 40 +++++++++++++++++++++++++++++
>>>   qapi-schema.json      | 69 
>>> +++++++++++++++++++++++++++++++++++++++++++++++++++
>>>   3 files changed, 151 insertions(+)
>>>
>>
>

Re: [Qemu-devel] [PATCH V6 0/2] Add new qmp commands to suppurt Xen COLO

[Dr. David Alan Gilbert]

* Jason Wang (jasowang@redhat.com) wrote:
> 
> 
> On 2017年01月26日 11:04, Zhang Chen wrote:
> > Hi~
> > 
> > No news for a week.
> > 
> > We need comments ~~
> > 
> > Ping...
> > 
> 
> Cc David who is one of the maintainer of migration.

My difficulty is I don't know any Xen and I don't understand
the block replication code much either; so I hadn't really looked at it.

Dave

> 
> > 
> > Thanks
> > 
> > Zhang Chen
> > 
> > 
> > On 01/19/2017 05:57 PM, Zhang Chen wrote:
> > > Hi~~
> > > 
> > > Anyone have any comments?
> > > 
> > > Ping....
> > > 
> > > 
> > > Thanks
> > > 
> > > Zhang Chen
> > > 
> > > 
> > > On 01/05/2017 02:08 PM, Zhang Chen wrote:
> > > > 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
> > > > 
> > > >   docs/qmp-commands.txt | 42 +++++++++++++++++++++++++++++++
> > > >   migration/colo.c      | 40 +++++++++++++++++++++++++++++
> > > >   qapi-schema.json      | 69
> > > > +++++++++++++++++++++++++++++++++++++++++++++++++++
> > > >   3 files changed, 151 insertions(+)
> > > > 
> > > 
> > 
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Re: [Qemu-devel] [PATCH V6 0/2] Add new qmp commands to suppurt Xen COLO

[Zhang Chen]

Hi~ Eric.

If you have time, please give me some comments.

This series has been sent for a long time.


Thanks

Zhang Chen


On 02/06/2017 09:13 PM, Dr. David Alan Gilbert wrote:
> * Jason Wang (jasowang@redhat.com) wrote:
>>
>> On 2017年01月26日 11:04, Zhang Chen wrote:
>>> Hi~
>>>
>>> No news for a week.
>>>
>>> We need comments ~~
>>>
>>> Ping...
>>>
>> Cc David who is one of the maintainer of migration.
> My difficulty is I don't know any Xen and I don't understand
> the block replication code much either; so I hadn't really looked at it.
>
> Dave
>
>>> Thanks
>>>
>>> Zhang Chen
>>>
>>>
>>> On 01/19/2017 05:57 PM, Zhang Chen wrote:
>>>> Hi~~
>>>>
>>>> Anyone have any comments?
>>>>
>>>> Ping....
>>>>
>>>>
>>>> Thanks
>>>>
>>>> Zhang Chen
>>>>
>>>>
>>>> On 01/05/2017 02:08 PM, Zhang Chen wrote:
>>>>> 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
>>>>>
>>>>>    docs/qmp-commands.txt | 42 +++++++++++++++++++++++++++++++
>>>>>    migration/colo.c      | 40 +++++++++++++++++++++++++++++
>>>>>    qapi-schema.json      | 69
>>>>> +++++++++++++++++++++++++++++++++++++++++++++++++++
>>>>>    3 files changed, 151 insertions(+)
>>>>>
> --
> Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
>
>
> .
>

-- 
Thanks
Zhang Chen

Re: [Qemu-devel] [PATCH V6 2/2] Add a new qmp command to do checkpoint, query xen replication status

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 880 bytes --]

On 01/05/2017 12:08 AM, 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>
> ---
>  docs/qmp-commands.txt | 24 ++++++++++++++++++++++++

This file no longer exists since commit 4d8bb958; can you please rebase
this and post a v7? (The docs now live directly in the qapi-schema.json
file).

>  migration/colo.c      | 17 +++++++++++++++++
>  qapi-schema.json      | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 91 insertions(+)

It looks like you have addressed all my concerns from earlier versions,
though, so the API seems reasonable.

-- 
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 --]

Re: [Qemu-devel] [PATCH V6 2/2] Add a new qmp command to do checkpoint, query xen replication status

[Zhang Chen]

On 02/07/2017 11:50 PM, Eric Blake wrote:
> On 01/05/2017 12:08 AM, 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>
>> ---
>>   docs/qmp-commands.txt | 24 ++++++++++++++++++++++++
> This file no longer exists since commit 4d8bb958; can you please rebase
> this and post a v7? (The docs now live directly in the qapi-schema.json
> file).

OK, I will send a V7.

>>   migration/colo.c      | 17 +++++++++++++++++
>>   qapi-schema.json      | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
>>   3 files changed, 91 insertions(+)
> It looks like you have addressed all my concerns from earlier versions,
> though, so the API seems reasonable.


Thanks
Zhang Chen

>

-- 
Thanks
Zhang Chen