[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 12/13] iotests/common.rc: add disk_usage function
From: |
Eric Blake |
Subject: |
[PATCH v4 12/13] iotests/common.rc: add disk_usage function |
Date: |
Fri, 9 May 2025 15:40:29 -0500 |
From: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
Move the definition from iotests/250 to common.rc. This is used to
detect real disk usage of sparse files. In particular, we want to use
it for checking subclusters-based discards.
Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
Reviewed-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-ID: <20240913163942.423050-6-andrey.drobyshev@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
tests/qemu-iotests/common.rc | 6 ++++++
tests/qemu-iotests/250 | 5 -----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index 95c12577dd4..237f746af88 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -140,6 +140,12 @@ _optstr_add()
fi
}
+# report real disk usage for sparse files
+disk_usage()
+{
+ du --block-size=1 "$1" | awk '{print $1}'
+}
+
# Set the variables to the empty string to turn Valgrind off
# for specific processes, e.g.
# $ VALGRIND_QEMU_IO= ./check -qcow2 -valgrind 015
diff --git a/tests/qemu-iotests/250 b/tests/qemu-iotests/250
index af48f83abac..c0a0dbc0ff1 100755
--- a/tests/qemu-iotests/250
+++ b/tests/qemu-iotests/250
@@ -52,11 +52,6 @@ _unsupported_imgopts data_file
# bdrv_co_truncate(bs->file) call in qcow2_co_truncate(), which might succeed
# anyway.
-disk_usage()
-{
- du --block-size=1 $1 | awk '{print $1}'
-}
-
size=2100M
_make_test_img -o "cluster_size=1M,preallocation=metadata" $size
--
2.49.0
- [PATCH v4 08/13] mirror: Allow QMP override to declare target already zero, (continued)
- [PATCH v4 08/13] mirror: Allow QMP override to declare target already zero, Eric Blake, 2025/05/09
- [PATCH v4 11/13] mirror: Skip writing zeroes when target is already zero, Eric Blake, 2025/05/09
- [PATCH v4 13/13] tests: Add iotest mirror-sparse for recent patches, Eric Blake, 2025/05/09
- [PATCH v4 12/13] iotests/common.rc: add disk_usage function,
Eric Blake <=
- Re: [PATCH v4 00/13] Make blockdev-mirror dest sparse in more cases, Stefan Hajnoczi, 2025/05/12
- [PATCH v4 14/13] mirror: Reduce I/O when destination is detect-zeroes:unmap, Eric Blake, 2025/05/13