[PATCH] iotests: Improve mirror-sparse on various filesystems

[Eric Blake <eblake@redhat.com>]

Fiona reported that an ext4 filesystem on top of LVM can sometimes
report over-allocation to du (based on the hueristics the filesystem
is making while observing the contents being mirrored); even though
the contents and actual size matched, about 50% of the time the size
reported by disk_usage was too large by 4k, failing the test.

Similarly, on ZFS where a file is created with preallocation=full, du
does not see the full allocation until things have had time to settle;
adding a sync call reduces the chance of catching that async window:

| [I] febner@enia ~/qemu/build/tests/qemu-iotests (master)> qemu-img create my.raw 20M -f
|w -o preallocation=full
| Formatting 'my.raw', fmt=raw size=20971520 preallocation=full
| [I] febner@enia ~/qemu/build/tests/qemu-iotests (master)> du --block-size=1 my.raw
| 512 my.raw
| [I] febner@enia ~/qemu/build/tests/qemu-iotests (master)> du --block-size=1 my.raw
| 20980224    my.raw

Fiona also reported that on a compressed ZFS, the filesystem can end
up reporting smaller disk_usage if it re-compresses a file, despite a
fully-allocating mirror - but since I don't have a compressed ZFS
handy for reproducing that test, that may remain a sporadic problem
for another day.

Reported-by: Fiona Ebner <f.ebner@proxmox.com>
Fixes: c0ddcb2c ("tests: Add iotest mirror-sparse for recent patches")
Signed-off-by: Eric Blake <eblake@redhat.com>
---
 tests/qemu-iotests/common.rc           | 2 ++
 tests/qemu-iotests/tests/mirror-sparse | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index 237f746af88..c3fc0bcf02a 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -143,6 +143,8 @@ _optstr_add()
 # report real disk usage for sparse files
 disk_usage()
 {
+    # ZFS has lazy allocation; sync the file first for best results
+    sync "$1"
     du --block-size=1 "$1" | awk '{print $1}'
 }

diff --git a/tests/qemu-iotests/tests/mirror-sparse b/tests/qemu-iotests/tests/mirror-sparse
index 8c52a4e2448..338d6cfbb35 100755
--- a/tests/qemu-iotests/tests/mirror-sparse
+++ b/tests/qemu-iotests/tests/mirror-sparse
@@ -96,10 +96,12 @@ _send_qemu_cmd $h1 '{"execute": "blockdev-del", "arguments":
                 {"node-name": "dst"}}' 'return' \
                   | _filter_block_job_offset | _filter_block_job_len
 $QEMU_IMG compare -U -f $IMGFMT -F raw $TEST_IMG.base $TEST_IMG
+# Some filesystems can fudge allocations for various reasons; rather
+# than expecting precise 2M and 20M images, it is better to allow for slop.
 result=$(disk_usage $TEST_IMG)
 if test $result -lt $((3*1024*1024)); then
     actual=sparse
-elif test $result = $((20*1024*1024)); then
+elif test $result -gt $((19*1024*1024)); then
     actual=full
 else
     actual=unknown
-- 
2.49.0