69 lines
2.4 KiB
Diff
69 lines
2.4 KiB
Diff
From 644f39de9e2466a9570833b1070acf47a53863ea Mon Sep 17 00:00:00 2001
|
|
From: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
|
|
Date: Fri, 9 May 2025 15:40:29 -0500
|
|
Subject: [PATCH 14/16] iotests/common.rc: add disk_usage function
|
|
|
|
RH-Author: Eric Blake <eblake@redhat.com>
|
|
RH-MergeRequest: 365: blockdev-mirror: More efficient handling of sparse mirrors
|
|
RH-Jira: RHEL-82906 RHEL-83015
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
|
|
RH-Commit: [12/14] 0e5d4217f97fe6e952de23eedbc2b8d9c7600665 (ebblake/centos-qemu-kvm)
|
|
|
|
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>
|
|
Message-ID: <20250509204341.3553601-27-eblake@redhat.com>
|
|
(cherry picked from commit be9bac072ede6e6aa27079f59efcf17b56bd7b26)
|
|
Jira: https://issues.redhat.com/browse/RHEL-82906
|
|
Jira: https://issues.redhat.com/browse/RHEL-83015
|
|
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
---
|
|
tests/qemu-iotests/250 | 5 -----
|
|
tests/qemu-iotests/common.rc | 6 ++++++
|
|
2 files changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/tests/qemu-iotests/250 b/tests/qemu-iotests/250
|
|
index af48f83aba..c0a0dbc0ff 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
|
|
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
|
|
index 95c12577dd..237f746af8 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
|
|
--
|
|
2.48.1
|
|
|