From: Hanna Reitz <hreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
Hanna Reitz <hreitz@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
qemu-devel@nongnu.org
Subject: [PULL 02/24] iotests/MRCE: Write data to source
Date: Tue, 1 Feb 2022 15:42:11 +0100 [thread overview]
Message-ID: <20220201144233.617021-3-hreitz@redhat.com> (raw)
In-Reply-To: <20220201144233.617021-1-hreitz@redhat.com>
This test assumes that mirror flushes the source when entering the READY
state, and that the format level will pass that flush on to the protocol
level (where we intercept it with blkdebug).
However, apparently that does not happen when using a VMDK image with
zeroed_grain=on, which actually is the default set by testenv.py. Right
now, Python tests ignore IMGOPTS, though, so this has no effect; but
Vladimir has a series that will change this, so we need to fix this test
before that series lands.
We can fix it by writing data to the source before we start the mirror
job; apparently that makes the (VMDK) format layer change its mind and
pass on the pre-READY flush to the protocol level, so the test passes
again. (I presume, without any data written, mirror just does a 64M
zero write on the target, which VMDK with zeroed_grain=on basically just
ignores.)
Without this, we do not get a flush, and so blkdebug only sees a single
flush at the end of the job instead of two, and therefore does not
inject an error, which makes the block job complete instead of raising
an error.
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20211223165308.103793-1-hreitz@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
tests/qemu-iotests/tests/mirror-ready-cancel-error | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/tests/mirror-ready-cancel-error b/tests/qemu-iotests/tests/mirror-ready-cancel-error
index f2dc88881f..770ffca379 100755
--- a/tests/qemu-iotests/tests/mirror-ready-cancel-error
+++ b/tests/qemu-iotests/tests/mirror-ready-cancel-error
@@ -36,6 +36,11 @@ class TestMirrorReadyCancelError(iotests.QMPTestCase):
assert iotests.qemu_img_create('-f', iotests.imgfmt, target,
str(image_size)) == 0
+ # Ensure that mirror will copy something before READY so the
+ # target format layer will forward the pre-READY flush to its
+ # file child
+ assert iotests.qemu_io_silent('-c', 'write -P 1 0 64k', source) == 0
+
self.vm = iotests.VM()
self.vm.launch()
@@ -97,7 +102,7 @@ class TestMirrorReadyCancelError(iotests.QMPTestCase):
# Write something so will not leave the job immediately, but
# flush first (which will fail, thanks to blkdebug)
res = self.vm.qmp('human-monitor-command',
- command_line='qemu-io mirror-top "write 0 64k"')
+ command_line='qemu-io mirror-top "write -P 2 0 64k"')
self.assert_qmp(res, 'return', '')
# Drain status change events
--
2.34.1
next prev parent reply other threads:[~2022-02-01 16:59 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-01 14:42 [PULL 00/24] Block patches Hanna Reitz
2022-02-01 14:42 ` [PULL 01/24] tests/qemu-iotests: Fix 051 for binaries without 'lsi53c895a' Hanna Reitz
2022-02-01 14:42 ` Hanna Reitz [this message]
2022-02-01 14:42 ` [PULL 03/24] iotests.py: img_info_log(): rename imgopts argument Hanna Reitz
2022-02-01 14:42 ` [PULL 04/24] iotests.py: implement unsupported_imgopts Hanna Reitz
2022-02-01 14:42 ` [PULL 05/24] iotests: specify some unsupported_imgopts for python iotests Hanna Reitz
2022-02-01 14:42 ` [PULL 06/24] iotests.py: qemu_img*("create"): support IMGOPTS='compression_type=zstd' Hanna Reitz
2022-02-01 14:42 ` [PULL 07/24] iotests: drop qemu_img_verbose() helper Hanna Reitz
2022-02-01 14:42 ` [PULL 08/24] iotests.py: rewrite default luks support in qemu_img Hanna Reitz
2022-02-01 14:42 ` [PULL 09/24] iotest 303: explicit compression type Hanna Reitz
2022-02-01 14:42 ` [PULL 10/24] iotest 065: " Hanna Reitz
2022-02-14 19:53 ` Thomas Huth
2022-02-01 14:42 ` [PULL 11/24] iotests.py: filter out successful output of qemu-img create Hanna Reitz
2022-02-01 14:42 ` [PULL 12/24] iotests.py: filter compression type out Hanna Reitz
2022-02-01 14:42 ` [PULL 13/24] iotest 302: use img_info_log() helper Hanna Reitz
2022-02-01 14:42 ` [PULL 14/24] qcow2: simple case support for downgrading of qcow2 images with zstd Hanna Reitz
2022-02-01 14:42 ` [PULL 15/24] iotests/common.rc: introduce _qcow2_dump_header helper Hanna Reitz
2022-02-01 14:42 ` [PULL 16/24] iotests: massive use _qcow2_dump_header Hanna Reitz
2022-02-01 14:42 ` [PULL 17/24] iotest 39: " Hanna Reitz
2022-02-01 14:42 ` [PULL 18/24] iotests: bash tests: filter compression type Hanna Reitz
2022-02-01 14:42 ` [PULL 19/24] iotests 60: more accurate set dirty bit in qcow2 header Hanna Reitz
2022-02-01 14:42 ` [PULL 20/24] iotest 214: explicit compression type Hanna Reitz
2022-02-01 14:42 ` [PULL 21/24] iotests: declare lack of support for compresion_type in IMGOPTS Hanna Reitz
2022-02-01 14:42 ` [PULL 22/24] block-backend: Retain permissions after migration Hanna Reitz
2022-02-01 14:42 ` [PULL 23/24] iotests/migration-permissions: New test Hanna Reitz
2022-02-01 14:42 ` [PULL 24/24] block.h: remove outdated comment Hanna Reitz
2022-02-01 19:47 ` [PULL 00/24] Block patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220201144233.617021-3-hreitz@redhat.com \
--to=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).