[PATCH] tests/migration: fix parameter of auto-converge migration

[PATCH] tests/migration: fix parameter of auto-converge migration

[huangy81]

From: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>

when execute the following test command:
$ ./guestperf-batch.py --auto-converge \
    --auto-converge-step {percent} ...
test aborts and error message be throwed as the following:
"Parameter 'x-cpu-throttle-increment' is unexpected"

The reason is that 'x-cpu-throttle-increment' has been
deprecated and 'cpu-throttle-increment' was introduced
Since v2.7. Use the new parameter instead.

Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
---
 tests/migration/guestperf/engine.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py
index e399447..6b49aed 100644
--- a/tests/migration/guestperf/engine.py
+++ b/tests/migration/guestperf/engine.py
@@ -102,7 +102,7 @@ def _migrate_progress(self, vm):
             info.get("downtime", 0),
             info.get("expected-downtime", 0),
             info.get("setup-time", 0),
-            info.get("x-cpu-throttle-percentage", 0),
+            info.get("cpu-throttle-percentage", 0),
         )

     def _migrate(self, hardware, scenario, src, dst, connect_uri):
@@ -135,7 +135,7 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri):
                                      "state": True }
                                ])
             resp = src.command("migrate-set-parameters",
-                               x_cpu_throttle_increment=scenario._auto_converge_step)
+                               cpu_throttle_increment=scenario._auto_converge_step)

         if scenario._post_copy:
             resp = src.command("migrate-set-capabilities",
--
1.8.3.1

Re: [PATCH] tests/migration: fix parameter of auto-converge migration

[Dr. David Alan Gilbert]

* huangy81@chinatelecom.cn (huangy81@chinatelecom.cn) wrote:
> From: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
> 
> when execute the following test command:
> $ ./guestperf-batch.py --auto-converge \
>     --auto-converge-step {percent} ...
> test aborts and error message be throwed as the following:
> "Parameter 'x-cpu-throttle-increment' is unexpected"
> 
> The reason is that 'x-cpu-throttle-increment' has been
> deprecated and 'cpu-throttle-increment' was introduced
> Since v2.7. Use the new parameter instead.
> 
> Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Please cc thuth@redhat.com and berrange@redhat.com on fixes to this
file.

> ---
>  tests/migration/guestperf/engine.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py
> index e399447..6b49aed 100644
> --- a/tests/migration/guestperf/engine.py
> +++ b/tests/migration/guestperf/engine.py
> @@ -102,7 +102,7 @@ def _migrate_progress(self, vm):
>              info.get("downtime", 0),
>              info.get("expected-downtime", 0),
>              info.get("setup-time", 0),
> -            info.get("x-cpu-throttle-percentage", 0),
> +            info.get("cpu-throttle-percentage", 0),
>          )
> 
>      def _migrate(self, hardware, scenario, src, dst, connect_uri):
> @@ -135,7 +135,7 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri):
>                                       "state": True }
>                                 ])
>              resp = src.command("migrate-set-parameters",
> -                               x_cpu_throttle_increment=scenario._auto_converge_step)
> +                               cpu_throttle_increment=scenario._auto_converge_step)
> 
>          if scenario._post_copy:
>              resp = src.command("migrate-set-capabilities",
> --
> 1.8.3.1
> 
-- 
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Re: [PATCH] tests/migration: fix parameter of auto-converge migration

[Thomas Huth]

On 23/03/2021 20.40, Dr. David Alan Gilbert wrote:
> * huangy81@chinatelecom.cn (huangy81@chinatelecom.cn) wrote:
>> From: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
>>
>> when execute the following test command:
>> $ ./guestperf-batch.py --auto-converge \
>>      --auto-converge-step {percent} ...
>> test aborts and error message be throwed as the following:
>> "Parameter 'x-cpu-throttle-increment' is unexpected"
>>
>> The reason is that 'x-cpu-throttle-increment' has been
>> deprecated and 'cpu-throttle-increment' was introduced
>> Since v2.7. Use the new parameter instead.
>>
>> Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
> 
> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> 
> Please cc thuth@redhat.com and berrange@redhat.com on fixes to this
> file.

This not really my turf, since it's not directly related to the qtests.

But I wonder why tests/migration/ is not listed in the "Migration" sections 
in the MAINTAINERS file ... care to send a patch?

  Thomas

Re: [PATCH] tests/migration: fix parameter of auto-converge migration

[Hyman Huang]

在 2021/3/24 13:42, Thomas Huth 写道:
> On 23/03/2021 20.40, Dr. David Alan Gilbert wrote:
>> * huangy81@chinatelecom.cn (huangy81@chinatelecom.cn) wrote:
>>> From: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
>>>
>>> when execute the following test command:
>>> $ ./guestperf-batch.py --auto-converge \
>>>      --auto-converge-step {percent} ...
>>> test aborts and error message be throwed as the following:
>>> "Parameter 'x-cpu-throttle-increment' is unexpected"
>>>
>>> The reason is that 'x-cpu-throttle-increment' has been
>>> deprecated and 'cpu-throttle-increment' was introduced
>>> Since v2.7. Use the new parameter instead.
>>>
>>> Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
>>
>> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
>>
>> Please cc thuth@redhat.com and berrange@redhat.com on fixes to this
>> file.
> 
> This not really my turf, since it's not directly related to the qtests.
> 
> But I wonder why tests/migration/ is not listed in the "Migration" 
> sections in the MAINTAINERS file ... care to send a patch?

the following patch aim to do this, it's already reviewed and has not 
been merged yet.

https://patchew.org/QEMU/91d5978357fb8709ef61d2030984f7142847037d.1616141556.git.huangy81@chinatelecom.cn/

> 
>   Thomas
> 

-- 
Best regard

Hyman Huang(黄勇)

Re: [PATCH] tests/migration: fix parameter of auto-converge migration

[Dr. David Alan Gilbert]

* huangy81@chinatelecom.cn (huangy81@chinatelecom.cn) wrote:
> From: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
> 
> when execute the following test command:
> $ ./guestperf-batch.py --auto-converge \
>     --auto-converge-step {percent} ...
> test aborts and error message be throwed as the following:
> "Parameter 'x-cpu-throttle-increment' is unexpected"
> 
> The reason is that 'x-cpu-throttle-increment' has been
> deprecated and 'cpu-throttle-increment' was introduced
> Since v2.7. Use the new parameter instead.
> 
> Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>

Queued

> ---
>  tests/migration/guestperf/engine.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py
> index e399447..6b49aed 100644
> --- a/tests/migration/guestperf/engine.py
> +++ b/tests/migration/guestperf/engine.py
> @@ -102,7 +102,7 @@ def _migrate_progress(self, vm):
>              info.get("downtime", 0),
>              info.get("expected-downtime", 0),
>              info.get("setup-time", 0),
> -            info.get("x-cpu-throttle-percentage", 0),
> +            info.get("cpu-throttle-percentage", 0),
>          )
> 
>      def _migrate(self, hardware, scenario, src, dst, connect_uri):
> @@ -135,7 +135,7 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri):
>                                       "state": True }
>                                 ])
>              resp = src.command("migrate-set-parameters",
> -                               x_cpu_throttle_increment=scenario._auto_converge_step)
> +                               cpu_throttle_increment=scenario._auto_converge_step)
> 
>          if scenario._post_copy:
>              resp = src.command("migrate-set-capabilities",
> --
> 1.8.3.1
> 
> 
-- 
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK