[PULL -rce 0/1] NBD patches for 2025-04-03

[PULL -rce 0/1] NBD patches for 2025-04-03

[Eric Blake]

The following changes since commit 0adf626718bc0ca9c46550249a76047f8e45da15:

  Update version for v10.0.0-rc2 release (2025-04-01 13:15:45 -0400)

are available in the Git repository at:

  https://repo.or.cz/qemu/ericb.git tags/pull-nbd-2025-04-03

for you to fetch changes up to 961841472d25ab70642d182e486b36afeb3fef26:

  Revert "iotests: Stop NBD server in test 162 before starting the next one" (2025-04-03 16:57:57 -0500)

----------------------------------------------------------------
NBD patches for 2025-04-03

- revert iotest 162 workaround, now that qemu-nbd bug is fixed

----------------------------------------------------------------
Thomas Huth (1):
      Revert "iotests: Stop NBD server in test 162 before starting the next one"

 tests/qemu-iotests/162 | 1 -
 1 file changed, 1 deletion(-)

Low risk for -rc3 (only affects iotest not main binaries), but that
also means that given how close we are to release, it's also okay if
it gets delayed if nothing else that actually needs -rc3 surfaces.

-- 
2.48.1

[PULL 1/1] Revert "iotests: Stop NBD server in test 162 before starting the next one"

[Eric Blake]

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 3e1683485656, we now don't need the "_stop_nbd_server" here
anymore.

Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250326143533.932899-1-thuth@redhat.com>
Signed-off-by: Eric Blake <eblake@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.48.1

Re: [PULL -rce 0/1] NBD patches for 2025-04-03

[Eric Blake]

Sorry for the typo in the subject line; that should be -rc3 (and not
rce - this is not an exploit).

On Thu, Apr 03, 2025 at 05:19:26PM -0500, Eric Blake wrote:
> The following changes since commit 0adf626718bc0ca9c46550249a76047f8e45da15:
> 
>   Update version for v10.0.0-rc2 release (2025-04-01 13:15:45 -0400)

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

Re: [PULL -rce 0/1] NBD patches for 2025-04-03

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 116 bytes --]

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/10.0 for any user-visible changes.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]