[PATCH] iotests/277: Use iotests.sock_dir for socket creation

[PATCH] iotests/277: Use iotests.sock_dir for socket creation

[Andrey Drobyshev]

If socket path is too long (longer than 108 bytes), socket can't be
opened.  This might lead to failure when test dir path is long enough.
Make sure socket is created in iotests.sock_dir to avoid such a case.

This commit basically aligns iotests/277 with the rest of iotests.

Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
---
 tests/qemu-iotests/277 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/277 b/tests/qemu-iotests/277
index 24833e7eb6..4224202ac2 100755
--- a/tests/qemu-iotests/277
+++ b/tests/qemu-iotests/277
@@ -27,7 +27,8 @@ from iotests import file_path, log
 iotests.script_initialize()
 
 
-nbd_sock, conf_file = file_path('nbd-sock', 'nbd-fault-injector.conf')
+conf_file = file_path('nbd-fault-injector.conf')
+nbd_sock = file_path('nbd-sock', base_dir=iotests.sock_dir)
 
 
 def make_conf_file(event):
-- 
2.39.3

Re: [PATCH] iotests/277: Use iotests.sock_dir for socket creation

[Eric Blake]

On Wed, Jan 24, 2024 at 06:22:57PM +0200, Andrey Drobyshev wrote:
> If socket path is too long (longer than 108 bytes), socket can't be
> opened.  This might lead to failure when test dir path is long enough.
> Make sure socket is created in iotests.sock_dir to avoid such a case.
> 
> This commit basically aligns iotests/277 with the rest of iotests.
> 
> Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
> ---
>  tests/qemu-iotests/277 | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

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

> 
> diff --git a/tests/qemu-iotests/277 b/tests/qemu-iotests/277
> index 24833e7eb6..4224202ac2 100755
> --- a/tests/qemu-iotests/277
> +++ b/tests/qemu-iotests/277
> @@ -27,7 +27,8 @@ from iotests import file_path, log
>  iotests.script_initialize()
>  
>  
> -nbd_sock, conf_file = file_path('nbd-sock', 'nbd-fault-injector.conf')
> +conf_file = file_path('nbd-fault-injector.conf')
> +nbd_sock = file_path('nbd-sock', base_dir=iotests.sock_dir)
>  
>  
>  def make_conf_file(event):
> -- 
> 2.39.3
> 

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.
Virtualization:  qemu.org | libguestfs.org

Re: [PATCH] iotests/277: Use iotests.sock_dir for socket creation

[Denis V. Lunev]

On 1/24/24 18:43, Eric Blake wrote:
> On Wed, Jan 24, 2024 at 06:22:57PM +0200, Andrey Drobyshev wrote:
>> If socket path is too long (longer than 108 bytes), socket can't be
>> opened.  This might lead to failure when test dir path is long enough.
>> Make sure socket is created in iotests.sock_dir to avoid such a case.
>>
>> This commit basically aligns iotests/277 with the rest of iotests.
>>
>> Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
>> ---
>>   tests/qemu-iotests/277 | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
> Reviewed-by: Eric Blake <eblake@redhat.com>
>
>> diff --git a/tests/qemu-iotests/277 b/tests/qemu-iotests/277
>> index 24833e7eb6..4224202ac2 100755
>> --- a/tests/qemu-iotests/277
>> +++ b/tests/qemu-iotests/277
>> @@ -27,7 +27,8 @@ from iotests import file_path, log
>>   iotests.script_initialize()
>>   
>>   
>> -nbd_sock, conf_file = file_path('nbd-sock', 'nbd-fault-injector.conf')
>> +conf_file = file_path('nbd-fault-injector.conf')
>> +nbd_sock = file_path('nbd-sock', base_dir=iotests.sock_dir)
>>   
>>   
>>   def make_conf_file(event):
>> -- 
>> 2.39.3
>>
I would say that potentially the same code is present
in 264, it is :
disk_a, disk_b, nbd_sock = file_path('disk_a', 'disk_b', 'nbd-sock')
nbd_uri = 'nbd+unix:///?socket=' + nbd_sock

Re: [PATCH] iotests/277: Use iotests.sock_dir for socket creation

[Andrey Drobyshev]

On 1/24/24 19:59, Denis V. Lunev wrote:
> On 1/24/24 18:43, Eric Blake wrote:
>> On Wed, Jan 24, 2024 at 06:22:57PM +0200, Andrey Drobyshev wrote:
>>> If socket path is too long (longer than 108 bytes), socket can't be
>>> opened.  This might lead to failure when test dir path is long enough.
>>> Make sure socket is created in iotests.sock_dir to avoid such a case.
>>>
>>> This commit basically aligns iotests/277 with the rest of iotests.
>>>
>>> Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
>>> ---
>>>   tests/qemu-iotests/277 | 3 ++-
>>>   1 file changed, 2 insertions(+), 1 deletion(-)
>> Reviewed-by: Eric Blake <eblake@redhat.com>
>>
>>> diff --git a/tests/qemu-iotests/277 b/tests/qemu-iotests/277
>>> index 24833e7eb6..4224202ac2 100755
>>> --- a/tests/qemu-iotests/277
>>> +++ b/tests/qemu-iotests/277
>>> @@ -27,7 +27,8 @@ from iotests import file_path, log
>>>   iotests.script_initialize()
>>>     -nbd_sock, conf_file = file_path('nbd-sock',
>>> 'nbd-fault-injector.conf')
>>> +conf_file = file_path('nbd-fault-injector.conf')
>>> +nbd_sock = file_path('nbd-sock', base_dir=iotests.sock_dir)
>>>       def make_conf_file(event):
>>> -- 
>>> 2.39.3
>>>
> I would say that potentially the same code is present
> in 264, it is :
> disk_a, disk_b, nbd_sock = file_path('disk_a', 'disk_b', 'nbd-sock')
> nbd_uri = 'nbd+unix:///?socket=' + nbd_sock

Thanks, have just sent a separate fix for iotests/264.  Haven't found
any others.

Andrey

Re: [PATCH] iotests/277: Use iotests.sock_dir for socket creation

[Kevin Wolf]

Am 24.01.2024 um 17:22 hat Andrey Drobyshev geschrieben:
> If socket path is too long (longer than 108 bytes), socket can't be
> opened.  This might lead to failure when test dir path is long enough.
> Make sure socket is created in iotests.sock_dir to avoid such a case.
> 
> This commit basically aligns iotests/277 with the rest of iotests.
> 
> Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>

Thanks, applied to the block branch.

Kevin