From: "Denis V. Lunev" <den@openvz.org>
To: qemu-block@nongnu.org, qemu-devel@nongnu.org
Cc: stefanha@redhat.com, alexander.ivanov@virtuozzo.com,
mike.maslenkin@gmail.com, "Denis V. Lunev" <den@openvz.org>
Subject: [PATCH 13/22] tests: fix broken deduplication check in parallels format test
Date: Mon, 18 Sep 2023 20:00:51 +0200 [thread overview]
Message-ID: <20230918180100.524843-15-den@openvz.org> (raw)
In-Reply-To: <20230918180100.524843-1-den@openvz.org>
Original check is broken as supposed reading from 2 different clusters
results in read from the same file offset twice. This is definitely
wrong.
We should be sure that
* the content of both clusters is correct after repair
* clusters are at the different offsets after repair
In order to check the latter we write some content into the first one
and validate that fact.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Reviewed-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
---
tests/qemu-iotests/tests/parallels-checks | 14 ++++++++++----
tests/qemu-iotests/tests/parallels-checks.out | 16 ++++++++++++----
2 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/tests/qemu-iotests/tests/parallels-checks b/tests/qemu-iotests/tests/parallels-checks
index f4ca50295e..df99558486 100755
--- a/tests/qemu-iotests/tests/parallels-checks
+++ b/tests/qemu-iotests/tests/parallels-checks
@@ -117,14 +117,20 @@ echo "== check second cluster =="
echo "== repair image =="
_check_test_img -r all
+echo "== check the first cluster =="
+{ $QEMU_IO -r -c "read -P 0x11 0 $CLUSTER_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir
+
echo "== check second cluster =="
{ $QEMU_IO -r -c "read -P 0x11 $CLUSTER_SIZE $CLUSTER_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir
-echo "== check first cluster on host =="
-printf "content: 0x%02x\n" `peek_file_le $TEST_IMG $(($CLUSTER_SIZE)) 1`
+echo "== write another pattern to the first clusters =="
+{ $QEMU_IO -c "write -P 0x66 0 $CLUSTER_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir
+
+echo "== check the first cluster =="
+{ $QEMU_IO -r -c "read -P 0x66 0 $CLUSTER_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir
-echo "== check second cluster on host =="
-printf "content: 0x%02x\n" `peek_file_le $TEST_IMG $(($CLUSTER_SIZE)) 1`
+echo "== check the second cluster (deduplicated) =="
+{ $QEMU_IO -r -c "read -P 0x11 $CLUSTER_SIZE $CLUSTER_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir
# Clear image
_make_test_img $SIZE
diff --git a/tests/qemu-iotests/tests/parallels-checks.out b/tests/qemu-iotests/tests/parallels-checks.out
index 74a5e29260..1325d2b611 100644
--- a/tests/qemu-iotests/tests/parallels-checks.out
+++ b/tests/qemu-iotests/tests/parallels-checks.out
@@ -55,13 +55,21 @@ The following inconsistencies were found and repaired:
Double checking the fixed image now...
No errors were found on the image.
+== check the first cluster ==
+read 1048576/1048576 bytes at offset 0
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
== check second cluster ==
read 1048576/1048576 bytes at offset 1048576
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-== check first cluster on host ==
-content: 0x11
-== check second cluster on host ==
-content: 0x11
+== write another pattern to the first clusters ==
+wrote 1048576/1048576 bytes at offset 0
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+== check the first cluster ==
+read 1048576/1048576 bytes at offset 0
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+== check the second cluster (deduplicated) ==
+read 1048576/1048576 bytes at offset 1048576
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304
== TEST DATA_OFF CHECK ==
== write pattern to first cluster ==
--
2.34.1
next prev parent reply other threads:[~2023-09-18 18:02 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-18 18:00 [PATCH v2 00/22] implement discard operation for Parallels images Denis V. Lunev
2023-09-18 18:00 ` [PATCH 01/22] parallels: fix formatting in bdrv_parallels initialization Denis V. Lunev
2023-09-18 18:00 ` [PATCH 02/22] parallels: mark driver as supporting CBT Denis V. Lunev
2023-09-18 18:00 ` [PATCH 03/22] parallels: fix memory leak in parallels_open() Denis V. Lunev
2023-09-19 9:28 ` Alexander Ivanov
2023-09-18 18:00 ` [PATCH 3/3] tests: extend test 131 to cover availability of the write-zeroes Denis V. Lunev
2023-09-18 18:05 ` Denis V. Lunev
2023-09-18 18:00 ` [PATCH 04/22] parallels: invent parallels_opts_prealloc() helper to parse prealloc opts Denis V. Lunev
2023-09-19 9:34 ` Alexander Ivanov
2023-09-18 18:00 ` [PATCH 05/22] parallels: return earler in fail_format branch in parallels_open() Denis V. Lunev
2023-09-18 18:00 ` [PATCH 06/22] parallels: return earlier from parallels_open() function on error Denis V. Lunev
2023-09-18 18:00 ` [PATCH 07/22] parallels: refactor path when we need to re-check image in parallels_open Denis V. Lunev
2023-09-18 18:00 ` [PATCH 08/22] parallels: create mark_used() helper which sets bit in used bitmap Denis V. Lunev
2023-09-18 18:00 ` [PATCH 09/22] tests: ensure that image validation will not cure the corruption Denis V. Lunev
2023-09-18 18:00 ` [PATCH 10/22] parallels: fix broken parallels_check_data_off() Denis V. Lunev
2023-09-18 18:00 ` [PATCH 11/22] parallels: add test which will validate data_off fixes through repair Denis V. Lunev
2023-09-18 18:00 ` [PATCH 12/22] parallels: collect bitmap of used clusters at open Denis V. Lunev
2023-09-18 18:00 ` Denis V. Lunev [this message]
2023-09-18 18:00 ` [PATCH 14/22] tests: test self-cure of parallels image with duplicated clusters Denis V. Lunev
2023-09-18 18:00 ` [PATCH 15/22] parallels: accept multiple clusters in mark_used() Denis V. Lunev
2023-09-18 18:00 ` [PATCH 16/22] parallels: update used bitmap in allocate_cluster Denis V. Lunev
2023-09-18 18:00 ` [PATCH 17/22] parallels: naive implementation of allocate_clusters with used bitmap Denis V. Lunev
2023-09-18 18:00 ` [PATCH 18/22] parallels: improve readability of allocate_clusters Denis V. Lunev
2023-09-18 18:00 ` [PATCH 19/22] parallels: naive implementation of parallels_co_pdiscard Denis V. Lunev
2023-09-19 9:42 ` Alexander Ivanov
2023-09-18 18:00 ` [PATCH 20/22] tests: extend test 131 to cover availability of the discard operation Denis V. Lunev
2023-09-19 9:56 ` Alexander Ivanov
2023-09-18 18:00 ` [PATCH 21/22] parallels: naive implementation of parallels_co_pwrite_zeroes Denis V. Lunev
2023-09-18 18:01 ` [PATCH 22/22] tests: extend test 131 to cover availability of the write-zeroes Denis V. Lunev
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=20230918180100.524843-15-den@openvz.org \
--to=den@openvz.org \
--cc=alexander.ivanov@virtuozzo.com \
--cc=mike.maslenkin@gmail.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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).