Re: [PATCH for-11.1?] qemu-iotest 161: fix race

[Kevin Wolf <kwolf@redhat.com>]

Am 28.07.2026 um 22:36 hat Michael Tokarev geschrieben:
> On 7/28/26 20:53, Kevin Wolf wrote:
> 
> > > diff --git a/tests/qemu-iotests/161 b/tests/qemu-iotests/161
> > > index f25effab936..0b8ba0b19e2 100755
> > > --- a/tests/qemu-iotests/161
> > > +++ b/tests/qemu-iotests/161
> > > @@ -106,6 +106,7 @@ echo
> > >   echo "*** Commit and then change an option on the backing file"
> > >   echo
> > >   # Create the images again
> > > +rm -f -- "$TEST_IMG.base" "$TEST_IMG.int"
> > >   TEST_IMG="$TEST_IMG.base" _make_test_img $IMG_SIZE
> > >   TEST_IMG="$TEST_IMG.int" _make_test_img -b "$TEST_IMG.base" -F $IMGFMT
> > >   _make_test_img -b "$TEST_IMG.int" -F $IMGFMT
> > 
> > This can only work for the file protocol, but the test also supports
> > fuse, which is now broken.
> 
> I haven't noticed _rm_test_img function.  I wonder maybe we can add
> this rm into _make_test_img directly, and fix this for all tests?
> 
> _make_test_img already calls _rm_test_img - for fuse protocol exactly.
> It can call _rm_test_img unconditionally, I guess.

Using _rm_test_img should do the trick for 161 because it only supports
file and fuse anyway. Those are the obvious two protocols that work with
_rm_test_img.

Some others might work, too, because they just export a local file that
can be deleted normally (nbd, ssh, nfs). _make_test_img() seems to take
care of restarting the NBD server so that it would then serve the new
image. I suppose SSH and NFS don't need to be notified and would
automatically serve the new image. It's not entirely obvious, but it
looks like it could work.

rbd probably breaks, so we might need to exclude that.

Kevin