Patchwork [v2] Fix query-migrate documentation in qmp-commands.hx

login
register
mail settings
Submitter Orit Wasserman
Date Aug. 8, 2013, 5:05 p.m.
Message ID <1375981548-18567-1-git-send-email-owasserm@redhat.com>
Download mbox | patch
Permalink /patch/265786/
State New
Headers show

Comments

Orit Wasserman - Aug. 8, 2013, 5:05 p.m.
"ram" is present also when migration completes.
expected-downtime, total-time and downtime are no longer part of "ram" data.

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
---
 qmp-commands.hx | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
Eric Blake - Aug. 8, 2013, 6:41 p.m.
On 08/08/2013 11:05 AM, Orit Wasserman wrote:
> "ram" is present also when migration completes.
> expected-downtime, total-time and downtime are no longer part of "ram" data.
> 
> Signed-off-by: Orit Wasserman <owasserm@redhat.com>
> ---
>  qmp-commands.hx | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

Although this points out that Michael's patch that added 'setup-time' in
commit ed4fbd1 is missing the corresponding documentation here (my bad
for not catching that while reviewing his patch).
mrhines@linux.vnet.ibm.com - Aug. 8, 2013, 9:31 p.m.
On 08/08/2013 02:41 PM, Eric Blake wrote:
> On 08/08/2013 11:05 AM, Orit Wasserman wrote:
>> "ram" is present also when migration completes.
>> expected-downtime, total-time and downtime are no longer part of "ram" data.
>>
>> Signed-off-by: Orit Wasserman <owasserm@redhat.com>
>> ---
>>   qmp-commands.hx | 20 ++++++++++----------
>>   1 file changed, 10 insertions(+), 10 deletions(-)
> Reviewed-by: Eric Blake <eblake@redhat.com>
>
> Although this points out that Michael's patch that added 'setup-time' in
> commit ed4fbd1 is missing the corresponding documentation here (my bad
> for not catching that while reviewing his patch).
>

Ooops. Will get a patch for that into my tree and submit it in my next 
series.

- Michael
Luiz Capitulino - Aug. 12, 2013, 2:19 p.m.
On Thu,  8 Aug 2013 20:05:48 +0300
Orit Wasserman <owasserm@redhat.com> wrote:

> "ram" is present also when migration completes.
> expected-downtime, total-time and downtime are no longer part of "ram" data.
> 
> Signed-off-by: Orit Wasserman <owasserm@redhat.com>

Applied to the qmp branch, thanks.

> ---
>  qmp-commands.hx | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/qmp-commands.hx b/qmp-commands.hx
> index 2e59b0d..a22a841 100644
> --- a/qmp-commands.hx
> +++ b/qmp-commands.hx
> @@ -2626,8 +2626,8 @@ The main json-object contains the following:
>  - "expected-downtime": only present while migration is active
>                  total amount in ms for downtime that was calculated on
>                  the last bitmap round (json-int)
> -- "ram": only present if "status" is "active", it is a json-object with the
> -  following RAM information:
> +- "ram": only present if "status" is "active" or "complete", it is a
> +         json-object with the following RAM information:
>           - "transferred": amount transferred in bytes (json-int)
>           - "remaining": amount remaining to transfer in bytes (json-int)
>           - "total": total amount of memory in bytes (json-int)
> @@ -2669,12 +2669,12 @@ Examples:
>  -> { "execute": "query-migrate" }
>  <- { "return": {
>          "status": "completed",
> +        "total-time":12345,
> +        "downtime":12345,
>          "ram":{
>            "transferred":123,
>            "remaining":123,
>            "total":246,
> -          "total-time":12345,
> -          "downtime":12345,
>            "duplicate":123,
>            "normal":123,
>            "normal-bytes":123456
> @@ -2693,12 +2693,12 @@ Examples:
>  <- {
>        "return":{
>           "status":"active",
> +         "total-time":12345,
> +         "expected-downtime":12345,
>           "ram":{
>              "transferred":123,
>              "remaining":123,
>              "total":246,
> -            "total-time":12345,
> -            "expected-downtime":12345,
>              "duplicate":123,
>              "normal":123,
>              "normal-bytes":123456
> @@ -2712,12 +2712,12 @@ Examples:
>  <- {
>        "return":{
>           "status":"active",
> +         "total-time":12345,
> +         "expected-downtime":12345,
>           "ram":{
>              "total":1057024,
>              "remaining":1053304,
>              "transferred":3720,
> -            "total-time":12345,
> -            "expected-downtime":12345,
>              "duplicate":123,
>              "normal":123,
>              "normal-bytes":123456
> @@ -2736,13 +2736,13 @@ Examples:
>  <- {
>        "return":{
>           "status":"active",
> +         "total-time":12345,
> +         "expected-downtime":12345,
>           "capabilities" : [ { "capability": "xbzrle", "state" : true } ],
>           "ram":{
>              "total":1057024,
>              "remaining":1053304,
>              "transferred":3720,
> -            "total-time":12345,
> -            "expected-downtime":12345,
>              "duplicate":10,
>              "normal":3333,
>              "normal-bytes":3412992
Luiz Capitulino - Aug. 19, 2013, 6:41 p.m.
On Mon, 12 Aug 2013 10:19:52 -0400
Luiz Capitulino <lcapitulino@redhat.com> wrote:

> On Thu,  8 Aug 2013 20:05:48 +0300
> Orit Wasserman <owasserm@redhat.com> wrote:
> 
> > "ram" is present also when migration completes.
> > expected-downtime, total-time and downtime are no longer part of "ram" data.
> > 
> > Signed-off-by: Orit Wasserman <owasserm@redhat.com>
> 
> Applied to the qmp branch, thanks.

This one missed the deadline for 1.6. I'm my updating my tree for 1.7,
but this patch conflicts with 8f3067, which repeated for the setup-time
key the mistake this patch is fixing for other keys.

We need a respin for this patch, which should also move setup-time
to the main dict. Orit, I can do it myself if you want.

> 
> > ---
> >  qmp-commands.hx | 20 ++++++++++----------
> >  1 file changed, 10 insertions(+), 10 deletions(-)
> > 
> > diff --git a/qmp-commands.hx b/qmp-commands.hx
> > index 2e59b0d..a22a841 100644
> > --- a/qmp-commands.hx
> > +++ b/qmp-commands.hx
> > @@ -2626,8 +2626,8 @@ The main json-object contains the following:
> >  - "expected-downtime": only present while migration is active
> >                  total amount in ms for downtime that was calculated on
> >                  the last bitmap round (json-int)
> > -- "ram": only present if "status" is "active", it is a json-object with the
> > -  following RAM information:
> > +- "ram": only present if "status" is "active" or "complete", it is a
> > +         json-object with the following RAM information:
> >           - "transferred": amount transferred in bytes (json-int)
> >           - "remaining": amount remaining to transfer in bytes (json-int)
> >           - "total": total amount of memory in bytes (json-int)
> > @@ -2669,12 +2669,12 @@ Examples:
> >  -> { "execute": "query-migrate" }
> >  <- { "return": {
> >          "status": "completed",
> > +        "total-time":12345,
> > +        "downtime":12345,
> >          "ram":{
> >            "transferred":123,
> >            "remaining":123,
> >            "total":246,
> > -          "total-time":12345,
> > -          "downtime":12345,
> >            "duplicate":123,
> >            "normal":123,
> >            "normal-bytes":123456
> > @@ -2693,12 +2693,12 @@ Examples:
> >  <- {
> >        "return":{
> >           "status":"active",
> > +         "total-time":12345,
> > +         "expected-downtime":12345,
> >           "ram":{
> >              "transferred":123,
> >              "remaining":123,
> >              "total":246,
> > -            "total-time":12345,
> > -            "expected-downtime":12345,
> >              "duplicate":123,
> >              "normal":123,
> >              "normal-bytes":123456
> > @@ -2712,12 +2712,12 @@ Examples:
> >  <- {
> >        "return":{
> >           "status":"active",
> > +         "total-time":12345,
> > +         "expected-downtime":12345,
> >           "ram":{
> >              "total":1057024,
> >              "remaining":1053304,
> >              "transferred":3720,
> > -            "total-time":12345,
> > -            "expected-downtime":12345,
> >              "duplicate":123,
> >              "normal":123,
> >              "normal-bytes":123456
> > @@ -2736,13 +2736,13 @@ Examples:
> >  <- {
> >        "return":{
> >           "status":"active",
> > +         "total-time":12345,
> > +         "expected-downtime":12345,
> >           "capabilities" : [ { "capability": "xbzrle", "state" : true } ],
> >           "ram":{
> >              "total":1057024,
> >              "remaining":1053304,
> >              "transferred":3720,
> > -            "total-time":12345,
> > -            "expected-downtime":12345,
> >              "duplicate":10,
> >              "normal":3333,
> >              "normal-bytes":3412992
>
Orit Wasserman - Aug. 20, 2013, 10:33 a.m.
On 08/19/2013 09:41 PM, Luiz Capitulino wrote:
> On Mon, 12 Aug 2013 10:19:52 -0400
> Luiz Capitulino <lcapitulino@redhat.com> wrote:
> 
>> On Thu,  8 Aug 2013 20:05:48 +0300
>> Orit Wasserman <owasserm@redhat.com> wrote:
>>
>>> "ram" is present also when migration completes.
>>> expected-downtime, total-time and downtime are no longer part of "ram" data.
>>>
>>> Signed-off-by: Orit Wasserman <owasserm@redhat.com>
>>
>> Applied to the qmp branch, thanks.
> 
> This one missed the deadline for 1.6. I'm my updating my tree for 1.7,
> but this patch conflicts with 8f3067, which repeated for the setup-time
> key the mistake this patch is fixing for other keys.
> 
> We need a respin for this patch, which should also move setup-time
> to the main dict. Orit, I can do it myself if you want.
> 

That will be great,
Thanks,
Orit
>>
>>> ---
>>>  qmp-commands.hx | 20 ++++++++++----------
>>>  1 file changed, 10 insertions(+), 10 deletions(-)
>>>
>>> diff --git a/qmp-commands.hx b/qmp-commands.hx
>>> index 2e59b0d..a22a841 100644
>>> --- a/qmp-commands.hx
>>> +++ b/qmp-commands.hx
>>> @@ -2626,8 +2626,8 @@ The main json-object contains the following:
>>>  - "expected-downtime": only present while migration is active
>>>                  total amount in ms for downtime that was calculated on
>>>                  the last bitmap round (json-int)
>>> -- "ram": only present if "status" is "active", it is a json-object with the
>>> -  following RAM information:
>>> +- "ram": only present if "status" is "active" or "complete", it is a
>>> +         json-object with the following RAM information:
>>>           - "transferred": amount transferred in bytes (json-int)
>>>           - "remaining": amount remaining to transfer in bytes (json-int)
>>>           - "total": total amount of memory in bytes (json-int)
>>> @@ -2669,12 +2669,12 @@ Examples:
>>>  -> { "execute": "query-migrate" }
>>>  <- { "return": {
>>>          "status": "completed",
>>> +        "total-time":12345,
>>> +        "downtime":12345,
>>>          "ram":{
>>>            "transferred":123,
>>>            "remaining":123,
>>>            "total":246,
>>> -          "total-time":12345,
>>> -          "downtime":12345,
>>>            "duplicate":123,
>>>            "normal":123,
>>>            "normal-bytes":123456
>>> @@ -2693,12 +2693,12 @@ Examples:
>>>  <- {
>>>        "return":{
>>>           "status":"active",
>>> +         "total-time":12345,
>>> +         "expected-downtime":12345,
>>>           "ram":{
>>>              "transferred":123,
>>>              "remaining":123,
>>>              "total":246,
>>> -            "total-time":12345,
>>> -            "expected-downtime":12345,
>>>              "duplicate":123,
>>>              "normal":123,
>>>              "normal-bytes":123456
>>> @@ -2712,12 +2712,12 @@ Examples:
>>>  <- {
>>>        "return":{
>>>           "status":"active",
>>> +         "total-time":12345,
>>> +         "expected-downtime":12345,
>>>           "ram":{
>>>              "total":1057024,
>>>              "remaining":1053304,
>>>              "transferred":3720,
>>> -            "total-time":12345,
>>> -            "expected-downtime":12345,
>>>              "duplicate":123,
>>>              "normal":123,
>>>              "normal-bytes":123456
>>> @@ -2736,13 +2736,13 @@ Examples:
>>>  <- {
>>>        "return":{
>>>           "status":"active",
>>> +         "total-time":12345,
>>> +         "expected-downtime":12345,
>>>           "capabilities" : [ { "capability": "xbzrle", "state" : true } ],
>>>           "ram":{
>>>              "total":1057024,
>>>              "remaining":1053304,
>>>              "transferred":3720,
>>> -            "total-time":12345,
>>> -            "expected-downtime":12345,
>>>              "duplicate":10,
>>>              "normal":3333,
>>>              "normal-bytes":3412992
>>
>

Patch

diff --git a/qmp-commands.hx b/qmp-commands.hx
index 2e59b0d..a22a841 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -2626,8 +2626,8 @@  The main json-object contains the following:
 - "expected-downtime": only present while migration is active
                 total amount in ms for downtime that was calculated on
                 the last bitmap round (json-int)
-- "ram": only present if "status" is "active", it is a json-object with the
-  following RAM information:
+- "ram": only present if "status" is "active" or "complete", it is a
+         json-object with the following RAM information:
          - "transferred": amount transferred in bytes (json-int)
          - "remaining": amount remaining to transfer in bytes (json-int)
          - "total": total amount of memory in bytes (json-int)
@@ -2669,12 +2669,12 @@  Examples:
 -> { "execute": "query-migrate" }
 <- { "return": {
         "status": "completed",
+        "total-time":12345,
+        "downtime":12345,
         "ram":{
           "transferred":123,
           "remaining":123,
           "total":246,
-          "total-time":12345,
-          "downtime":12345,
           "duplicate":123,
           "normal":123,
           "normal-bytes":123456
@@ -2693,12 +2693,12 @@  Examples:
 <- {
       "return":{
          "status":"active",
+         "total-time":12345,
+         "expected-downtime":12345,
          "ram":{
             "transferred":123,
             "remaining":123,
             "total":246,
-            "total-time":12345,
-            "expected-downtime":12345,
             "duplicate":123,
             "normal":123,
             "normal-bytes":123456
@@ -2712,12 +2712,12 @@  Examples:
 <- {
       "return":{
          "status":"active",
+         "total-time":12345,
+         "expected-downtime":12345,
          "ram":{
             "total":1057024,
             "remaining":1053304,
             "transferred":3720,
-            "total-time":12345,
-            "expected-downtime":12345,
             "duplicate":123,
             "normal":123,
             "normal-bytes":123456
@@ -2736,13 +2736,13 @@  Examples:
 <- {
       "return":{
          "status":"active",
+         "total-time":12345,
+         "expected-downtime":12345,
          "capabilities" : [ { "capability": "xbzrle", "state" : true } ],
          "ram":{
             "total":1057024,
             "remaining":1053304,
             "transferred":3720,
-            "total-time":12345,
-            "expected-downtime":12345,
             "duplicate":10,
             "normal":3333,
             "normal-bytes":3412992