[PATCH] tests/migration: fix unix socket migration

[PATCH] tests/migration: fix unix socket migration

[huangy81]

From: Hyman <huangy81@chinatelecom.cn>

The test aborts and error message as the following be throwed:
"No such file or directory: '/var/tmp/qemu-migrate-{pid}.migrate",
when the unix socket migration test nearly done. The reason is
qemu removes the unix socket file after migration before
guestperf.py script do it. So pre-check if the socket file exists
when removing it to prevent the guestperf program from aborting.

Signed-off-by: Hyman <huangy81@chinatelecom.cn>
---
 tests/migration/guestperf/engine.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py
index 83bfc3b..86d4f21 100644
--- a/tests/migration/guestperf/engine.py
+++ b/tests/migration/guestperf/engine.py
@@ -405,7 +405,7 @@ def run(self, hardware, scenario, result_dir=os.getcwd()):
             progress_history = ret[0]
             qemu_timings = ret[1]
             vcpu_timings = ret[2]
-            if uri[0:5] == "unix:":
+            if uri[0:5] == "unix:" and os.path.exists(uri[5:]):
                 os.remove(uri[5:])
             if self._verbose:
                 print("Finished migration")
-- 
1.8.3.1

Re: [PATCH] tests/migration: fix unix socket migration

[Philippe Mathieu-Daudé]

On 3/9/21 5:00 PM, huangy81@chinatelecom.cn wrote:
> From: Hyman <huangy81@chinatelecom.cn>
> 
> The test aborts and error message as the following be throwed:
> "No such file or directory: '/var/tmp/qemu-migrate-{pid}.migrate",
> when the unix socket migration test nearly done. The reason is
> qemu removes the unix socket file after migration before
> guestperf.py script do it. So pre-check if the socket file exists
> when removing it to prevent the guestperf program from aborting.
> 
> Signed-off-by: Hyman <huangy81@chinatelecom.cn>
> ---
>  tests/migration/guestperf/engine.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Interesting, we have in MAINTAINERS:

Python scripts
M: Eduardo Habkost <ehabkost@redhat.com>
M: Cleber Rosa <crosa@redhat.com>
S: Odd Fixes
F: scripts/*.py
F: tests/*.py

However:

./scripts/get_maintainer.pl -f tests/migration/guestperf/engine.py
get_maintainer.pl: No maintainers found, printing recent contributors.
get_maintainer.pl: Do not blindly cc: them on patches!  Use common sense.

> diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py
> index 83bfc3b..86d4f21 100644
> --- a/tests/migration/guestperf/engine.py
> +++ b/tests/migration/guestperf/engine.py
> @@ -405,7 +405,7 @@ def run(self, hardware, scenario, result_dir=os.getcwd()):
>              progress_history = ret[0]
>              qemu_timings = ret[1]
>              vcpu_timings = ret[2]
> -            if uri[0:5] == "unix:":
> +            if uri[0:5] == "unix:" and os.path.exists(uri[5:]):
>                  os.remove(uri[5:])
>              if self._verbose:
>                  print("Finished migration")
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Re: [PATCH] tests/migration: fix unix socket migration

[Hyman Huang]

在 2021/3/10 0:55, Philippe Mathieu-Daudé 写道:
> On 3/9/21 5:00 PM, huangy81@chinatelecom.cn wrote:
>> From: Hyman <huangy81@chinatelecom.cn>
>>
>> The test aborts and error message as the following be throwed:
>> "No such file or directory: '/var/tmp/qemu-migrate-{pid}.migrate",
>> when the unix socket migration test nearly done. The reason is
>> qemu removes the unix socket file after migration before
>> guestperf.py script do it. So pre-check if the socket file exists
>> when removing it to prevent the guestperf program from aborting.
>>
>> Signed-off-by: Hyman <huangy81@chinatelecom.cn>
>> ---
>>   tests/migration/guestperf/engine.py | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Interesting, we have in MAINTAINERS:
> 
> Python scripts
> M: Eduardo Habkost <ehabkost@redhat.com>
> M: Cleber Rosa <crosa@redhat.com>
> S: Odd Fixes
> F: scripts/*.py
> F: tests/*.py
> 
> However:
> 
> ./scripts/get_maintainer.pl -f tests/migration/guestperf/engine.py
> get_maintainer.pl: No maintainers found, printing recent contributors.
> get_maintainer.pl: Do not blindly cc: them on patches!  Use common sense.

Ping

The following patch has fixed it
https://patchew.org/QEMU/91d5978357fb8709ef61d2030984f7142847037d.1616141556.git.huangy81@chinatelecom.cn/

> 
>> diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py
>> index 83bfc3b..86d4f21 100644
>> --- a/tests/migration/guestperf/engine.py
>> +++ b/tests/migration/guestperf/engine.py
>> @@ -405,7 +405,7 @@ def run(self, hardware, scenario, result_dir=os.getcwd()):
>>               progress_history = ret[0]
>>               qemu_timings = ret[1]
>>               vcpu_timings = ret[2]
>> -            if uri[0:5] == "unix:":
>> +            if uri[0:5] == "unix:" and os.path.exists(uri[5:]):
>>                   os.remove(uri[5:])
>>               if self._verbose:
>>                   print("Finished migration")
>>
> 
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> 
-- 
Best regard

Hyman Huang(黄勇)

Re: [PATCH] tests/migration: fix unix socket migration

[Wainer dos Santos Moschetta]

Cleber,

Maybe you could review then queue this one?

- Wainer

On 4/20/21 10:16 PM, Hyman Huang wrote:
>
> 在 2021/3/10 0:55, Philippe Mathieu-Daudé 写道:
>> On 3/9/21 5:00 PM, huangy81@chinatelecom.cn wrote:
>>> From: Hyman <huangy81@chinatelecom.cn>
>>>
>>> The test aborts and error message as the following be throwed:
>>> "No such file or directory: '/var/tmp/qemu-migrate-{pid}.migrate",
>>> when the unix socket migration test nearly done. The reason is
>>> qemu removes the unix socket file after migration before
>>> guestperf.py script do it. So pre-check if the socket file exists
>>> when removing it to prevent the guestperf program from aborting.
>>>
>>> Signed-off-by: Hyman <huangy81@chinatelecom.cn>
>>> ---
>>>   tests/migration/guestperf/engine.py | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> Interesting, we have in MAINTAINERS:
>>
>> Python scripts
>> M: Eduardo Habkost <ehabkost@redhat.com>
>> M: Cleber Rosa <crosa@redhat.com>
>> S: Odd Fixes
>> F: scripts/*.py
>> F: tests/*.py
>>
>> However:
>>
>> ./scripts/get_maintainer.pl -f tests/migration/guestperf/engine.py
>> get_maintainer.pl: No maintainers found, printing recent contributors.
>> get_maintainer.pl: Do not blindly cc: them on patches!  Use common 
>> sense.
>
> Ping
>
> The following patch has fixed it
> https://patchew.org/QEMU/91d5978357fb8709ef61d2030984f7142847037d.1616141556.git.huangy81@chinatelecom.cn/ 
>
>
>>
>>> diff --git a/tests/migration/guestperf/engine.py 
>>> b/tests/migration/guestperf/engine.py
>>> index 83bfc3b..86d4f21 100644
>>> --- a/tests/migration/guestperf/engine.py
>>> +++ b/tests/migration/guestperf/engine.py
>>> @@ -405,7 +405,7 @@ def run(self, hardware, scenario, 
>>> result_dir=os.getcwd()):
>>>               progress_history = ret[0]
>>>               qemu_timings = ret[1]
>>>               vcpu_timings = ret[2]
>>> -            if uri[0:5] == "unix:":
>>> +            if uri[0:5] == "unix:" and os.path.exists(uri[5:]):
>>>                   os.remove(uri[5:])
>>>               if self._verbose:
>>>                   print("Finished migration")
>>>
>>
>> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>

Re: [PATCH] tests/migration: fix unix socket migration

[Hyman]

在 2021/4/29 1:26, Wainer dos Santos Moschetta 写道:
> Cleber,
> 
> Maybe you could review then queue this one?
Ping

it seems that this patch has been left out :)

> 
> - Wainer
> 
> On 4/20/21 10:16 PM, Hyman Huang wrote:
>>
>> 在 2021/3/10 0:55, Philippe Mathieu-Daudé 写道:
>>> On 3/9/21 5:00 PM, huangy81@chinatelecom.cn wrote:
>>>> From: Hyman <huangy81@chinatelecom.cn>
>>>>
>>>> The test aborts and error message as the following be throwed:
>>>> "No such file or directory: '/var/tmp/qemu-migrate-{pid}.migrate",
>>>> when the unix socket migration test nearly done. The reason is
>>>> qemu removes the unix socket file after migration before
>>>> guestperf.py script do it. So pre-check if the socket file exists
>>>> when removing it to prevent the guestperf program from aborting.
>>>>
>>>> Signed-off-by: Hyman <huangy81@chinatelecom.cn>
>>>> ---
>>>>   tests/migration/guestperf/engine.py | 2 +-
>>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> Interesting, we have in MAINTAINERS:
>>>
>>> Python scripts
>>> M: Eduardo Habkost <ehabkost@redhat.com>
>>> M: Cleber Rosa <crosa@redhat.com>
>>> S: Odd Fixes
>>> F: scripts/*.py
>>> F: tests/*.py
>>>
>>> However:
>>>
>>> ./scripts/get_maintainer.pl -f tests/migration/guestperf/engine.py
>>> get_maintainer.pl: No maintainers found, printing recent contributors.
>>> get_maintainer.pl: Do not blindly cc: them on patches!  Use common 
>>> sense.
>>
>> Ping
>>
>> The following patch has fixed it
>> https://patchew.org/QEMU/91d5978357fb8709ef61d2030984f7142847037d.1616141556.git.huangy81@chinatelecom.cn/ 
>>
>>
>>>
>>>> diff --git a/tests/migration/guestperf/engine.py 
>>>> b/tests/migration/guestperf/engine.py
>>>> index 83bfc3b..86d4f21 100644
>>>> --- a/tests/migration/guestperf/engine.py
>>>> +++ b/tests/migration/guestperf/engine.py
>>>> @@ -405,7 +405,7 @@ def run(self, hardware, scenario, 
>>>> result_dir=os.getcwd()):
>>>>               progress_history = ret[0]
>>>>               qemu_timings = ret[1]
>>>>               vcpu_timings = ret[2]
>>>> -            if uri[0:5] == "unix:":
>>>> +            if uri[0:5] == "unix:" and os.path.exists(uri[5:]):
>>>>                   os.remove(uri[5:])
>>>>               if self._verbose:
>>>>                   print("Finished migration")
>>>>
>>>
>>> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>>
> 

Re: [PATCH] tests/migration: fix unix socket migration

[Hyman Huang]

Ping

cc the author and maintainer

在 2021/6/26 0:33, Hyman 写道:
> 
> 
> 在 2021/4/29 1:26, Wainer dos Santos Moschetta 写道:
>> Cleber,
>>
>> Maybe you could review then queue this one?
> Ping
> 
> it seems that this patch has been left out :)
> 
>>
>> - Wainer
>>
>> On 4/20/21 10:16 PM, Hyman Huang wrote:
>>>
>>> 在 2021/3/10 0:55, Philippe Mathieu-Daudé 写道:
>>>> On 3/9/21 5:00 PM, huangy81@chinatelecom.cn wrote:
>>>>> From: Hyman <huangy81@chinatelecom.cn>
>>>>>
>>>>> The test aborts and error message as the following be throwed:
>>>>> "No such file or directory: '/var/tmp/qemu-migrate-{pid}.migrate",
>>>>> when the unix socket migration test nearly done. The reason is
>>>>> qemu removes the unix socket file after migration before
>>>>> guestperf.py script do it. So pre-check if the socket file exists
>>>>> when removing it to prevent the guestperf program from aborting.
>>>>>
>>>>> Signed-off-by: Hyman <huangy81@chinatelecom.cn>
>>>>> ---
>>>>>   tests/migration/guestperf/engine.py | 2 +-
>>>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> Interesting, we have in MAINTAINERS:
>>>>
>>>> Python scripts
>>>> M: Eduardo Habkost <ehabkost@redhat.com>
>>>> M: Cleber Rosa <crosa@redhat.com>
>>>> S: Odd Fixes
>>>> F: scripts/*.py
>>>> F: tests/*.py
>>>>
>>>> However:
>>>>
>>>> ./scripts/get_maintainer.pl -f tests/migration/guestperf/engine.py
>>>> get_maintainer.pl: No maintainers found, printing recent contributors.
>>>> get_maintainer.pl: Do not blindly cc: them on patches!  Use common 
>>>> sense.
>>>
>>> Ping
>>>
>>> The following patch has fixed it
>>> https://patchew.org/QEMU/91d5978357fb8709ef61d2030984f7142847037d.1616141556.git.huangy81@chinatelecom.cn/ 
>>>
>>>
>>>>
>>>>> diff --git a/tests/migration/guestperf/engine.py 
>>>>> b/tests/migration/guestperf/engine.py
>>>>> index 83bfc3b..86d4f21 100644
>>>>> --- a/tests/migration/guestperf/engine.py
>>>>> +++ b/tests/migration/guestperf/engine.py
>>>>> @@ -405,7 +405,7 @@ def run(self, hardware, scenario, 
>>>>> result_dir=os.getcwd()):
>>>>>               progress_history = ret[0]
>>>>>               qemu_timings = ret[1]
>>>>>               vcpu_timings = ret[2]
>>>>> -            if uri[0:5] == "unix:":
>>>>> +            if uri[0:5] == "unix:" and os.path.exists(uri[5:]):
>>>>>                   os.remove(uri[5:])
>>>>>               if self._verbose:
>>>>>                   print("Finished migration")
>>>>>
>>>>
>>>> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>>>
>>

-- 
Best regard

Hyman Huang(黄勇)

Re: [PATCH] tests/migration: fix unix socket migration

[Wainer dos Santos Moschetta]

On 3/9/21 1:00 PM, huangy81@chinatelecom.cn wrote:
> From: Hyman <huangy81@chinatelecom.cn>
>
> The test aborts and error message as the following be throwed:
> "No such file or directory: '/var/tmp/qemu-migrate-{pid}.migrate",
> when the unix socket migration test nearly done. The reason is
> qemu removes the unix socket file after migration before
> guestperf.py script do it. So pre-check if the socket file exists
> when removing it to prevent the guestperf program from aborting.
>
> Signed-off-by: Hyman <huangy81@chinatelecom.cn>
> ---
>   tests/migration/guestperf/engine.py | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)


Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>


>
> diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py
> index 83bfc3b..86d4f21 100644
> --- a/tests/migration/guestperf/engine.py
> +++ b/tests/migration/guestperf/engine.py
> @@ -405,7 +405,7 @@ def run(self, hardware, scenario, result_dir=os.getcwd()):
>               progress_history = ret[0]
>               qemu_timings = ret[1]
>               vcpu_timings = ret[2]
> -            if uri[0:5] == "unix:":
> +            if uri[0:5] == "unix:" and os.path.exists(uri[5:]):
>                   os.remove(uri[5:])
>               if self._verbose:
>                   print("Finished migration")

Re: [PATCH] tests/migration: fix unix socket migration

[Philippe Mathieu-Daudé]

On 3/9/21 5:00 PM, huangy81@chinatelecom.cn wrote:
> From: Hyman <huangy81@chinatelecom.cn>
> 
> The test aborts and error message as the following be throwed:
> "No such file or directory: '/var/tmp/qemu-migrate-{pid}.migrate",
> when the unix socket migration test nearly done. The reason is
> qemu removes the unix socket file after migration before
> guestperf.py script do it. So pre-check if the socket file exists
> when removing it to prevent the guestperf program from aborting.
> 

Maintainer could amend:

See also commit f9cc00346d3 ("tests/migration: fix unix socket batch
migration").

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> Signed-off-by: Hyman <huangy81@chinatelecom.cn>
> ---
>  tests/migration/guestperf/engine.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py
> index 83bfc3b..86d4f21 100644
> --- a/tests/migration/guestperf/engine.py
> +++ b/tests/migration/guestperf/engine.py
> @@ -405,7 +405,7 @@ def run(self, hardware, scenario, result_dir=os.getcwd()):
>              progress_history = ret[0]
>              qemu_timings = ret[1]
>              vcpu_timings = ret[2]
> -            if uri[0:5] == "unix:":
> +            if uri[0:5] == "unix:" and os.path.exists(uri[5:]):
>                  os.remove(uri[5:])
>              if self._verbose:
>                  print("Finished migration")
> 

Re: [PATCH] tests/migration: fix unix socket migration

[Daniel P. Berrangé]

On Wed, Jul 07, 2021 at 10:28:10AM +0200, Philippe Mathieu-Daudé wrote:
> On 3/9/21 5:00 PM, huangy81@chinatelecom.cn wrote:
> > From: Hyman <huangy81@chinatelecom.cn>
> > 
> > The test aborts and error message as the following be throwed:
> > "No such file or directory: '/var/tmp/qemu-migrate-{pid}.migrate",
> > when the unix socket migration test nearly done. The reason is
> > qemu removes the unix socket file after migration before
> > guestperf.py script do it. So pre-check if the socket file exists
> > when removing it to prevent the guestperf program from aborting.
> > 
> 
> Maintainer could amend:
> 
> See also commit f9cc00346d3 ("tests/migration: fix unix socket batch
> migration").
> 
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

I'll send this one in a pull req i'm preparing.


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|