From: Thomas Huth <thuth@redhat.com>

This reverts commit e2668ba1ed44ad56f2f1653ff5f53b277d534fac.

This commit made test 162 fail occasionally with:

 162   fail       [13:06:40] [13:06:40]   0.2s   (last: 0.2s)  output mismatch
 --- tests/qemu-iotests/162.out
 +++ tests/qemu-iotests/scratch/qcow2-file-162/162.out.bad
 @@ -3,6 +3,7 @@
  === NBD ===
  qemu-img: Could not open 'json:{"driver": "nbd", "host": -1}': address
   resolution failed for -1:10809: Name or service not known
  image: nbd://localhost:PORT
 +./common.rc: line 371: kill: (891116) - No such process
  image: nbd+unix://?socket=42

The nbd server should normally terminate automatically, so trying to
kill it here now seems to cause a race that will cause a test failure
when the server terminated before the kill command has been executed.

The "Stop NBD server" patch has originally been written to solve another
problem with a hanging nbd server, but since that problem has been properly
solved by commit 1453e04c63, we now don't need the "_stop_nbd_server" here
anymore.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qemu-iotests/162 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162
index 956c2c5f339..94dae60d304 100755
--- a/tests/qemu-iotests/162
+++ b/tests/qemu-iotests/162
@@ -65,7 +65,6 @@ done
 
 $QEMU_IMG info "json:{'driver': 'nbd', 'host': 'localhost', 'port': $port}" \
     | grep '^image' | sed -e "s/$port/PORT/"
-_stop_nbd_server
 
 # This is a test for NBD's bdrv_refresh_filename() implementation: It expects
 # either host or path to be set, but it must not assume that they are set to
-- 
2.49.0

On 26.03.25 13:38, Thomas Huth wrote:
> From: Thomas Huth<thuth@redhat.com>
>
> This reverts commit e2668ba1ed44ad56f2f1653ff5f53b277d534fac.
>
> This commit made test 162 fail occasionally with:
>
>   162   fail       [13:06:40] [13:06:40]   0.2s   (last: 0.2s)  output mismatch
>   --- tests/qemu-iotests/162.out
>   +++ tests/qemu-iotests/scratch/qcow2-file-162/162.out.bad
>   @@ -3,6 +3,7 @@
>    === NBD ===
>    qemu-img: Could not open 'json:{"driver": "nbd", "host": -1}': address
>     resolution failed for -1:10809: Name or service not known
>    image: nbd://localhost:PORT
>   +./common.rc: line 371: kill: (891116) - No such process
>    image: nbd+unix://?socket=42
>
> The nbd server should normally terminate automatically, so trying to
> kill it here now seems to cause a race that will cause a test failure
> when the server terminated before the kill command has been executed.
>
> The "Stop NBD server" patch has originally been written to solve another
> problem with a hanging nbd server, but since that problem has been properly
> solved by commit 1453e04c63, we now don't need the "_stop_nbd_server" here

I can’t find that hash; do you mean 3e1683485656?

> anymore.
>
> Signed-off-by: Thomas Huth<thuth@redhat.com>
> ---
>   tests/qemu-iotests/162 | 1 -
>   1 file changed, 1 deletion(-)

With the hash fixed (or explained where I have to look :)):

Reviewed-by: Hanna Czenczek <hreitz@redhat.com>

On 26/03/2025 15.18, Hanna Czenczek wrote:
> On 26.03.25 13:38, Thomas Huth wrote:
>> From: Thomas Huth<thuth@redhat.com>
>>
>> This reverts commit e2668ba1ed44ad56f2f1653ff5f53b277d534fac.
>>
>> This commit made test 162 fail occasionally with:
>>
>>   162   fail       [13:06:40] [13:06:40]   0.2s   (last: 0.2s)  output mismatch
>>   --- tests/qemu-iotests/162.out
>>   +++ tests/qemu-iotests/scratch/qcow2-file-162/162.out.bad
>>   @@ -3,6 +3,7 @@
>>    === NBD ===
>>    qemu-img: Could not open 'json:{"driver": "nbd", "host": -1}': address
>>     resolution failed for -1:10809: Name or service not known
>>    image: nbd://localhost:PORT
>>   +./common.rc: line 371: kill: (891116) - No such process
>>    image: nbd+unix://?socket=42
>>
>> The nbd server should normally terminate automatically, so trying to
>> kill it here now seems to cause a race that will cause a test failure
>> when the server terminated before the kill command has been executed.
>>
>> The "Stop NBD server" patch has originally been written to solve another
>> problem with a hanging nbd server, but since that problem has been properly
>> solved by commit 1453e04c63, we now don't need the "_stop_nbd_server" here
> 
> I can’t find that hash; do you mean 3e1683485656?

Drat, copy-n-paste error from my side, it's 3e1683485656 indeed!

>> anymore.
>>
>> Signed-off-by: Thomas Huth<thuth@redhat.com>
>> ---
>>   tests/qemu-iotests/162 | 1 -
>>   1 file changed, 1 deletion(-)
> 
> With the hash fixed (or explained where I have to look :)):
> 
> Reviewed-by: Hanna Czenczek <hreitz@redhat.com>

  Thanks,
   Thomas