f696e6c6e2
- kvm-block-Expand-block-status-mode-from-bool-to-flags.patch [RHEL-88435 RHEL-88437] - kvm-file-posix-gluster-Handle-zero-block-status-hint-bet.patch [RHEL-88435 RHEL-88437] - kvm-block-Let-bdrv_co_is_zero_fast-consolidate-adjacent-.patch [RHEL-88435 RHEL-88437] - kvm-block-Add-new-bdrv_co_is_all_zeroes-function.patch [RHEL-88435 RHEL-88437] - kvm-iotests-Improve-iotest-194-to-mirror-data.patch [RHEL-88435 RHEL-88437] - kvm-mirror-Minor-refactoring.patch [RHEL-88435 RHEL-88437] - kvm-mirror-Pass-full-sync-mode-rather-than-bool-to-inter.patch [RHEL-88435 RHEL-88437] - kvm-mirror-Allow-QMP-override-to-declare-target-already-.patch [RHEL-88435 RHEL-88437] - kvm-mirror-Drop-redundant-zero_target-parameter.patch [RHEL-88435 RHEL-88437] - kvm-mirror-Skip-pre-zeroing-destination-if-it-is-already.patch [RHEL-88435 RHEL-88437] - kvm-mirror-Skip-writing-zeroes-when-target-is-already-ze.patch [RHEL-88435 RHEL-88437] - kvm-iotests-common.rc-add-disk_usage-function.patch [RHEL-88435 RHEL-88437] - kvm-tests-Add-iotest-mirror-sparse-for-recent-patches.patch [RHEL-88435 RHEL-88437] - kvm-mirror-Reduce-I-O-when-destination-is-detect-zeroes-.patch [RHEL-88435 RHEL-88437] - Resolves: RHEL-88435 (--migrate-disks-detect-zeroes doesn't take effect for disk migration [rhel-10.1]) - Resolves: RHEL-88437 (Disk size of target raw image is full allocated when doing mirror with default discard value [rhel-10.1])
69 lines
2.4 KiB
Diff
69 lines
2.4 KiB
Diff
From d8ed5039981b1eb81d229d8ee672d5ee28862e92 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 12/14] iotests/common.rc: add disk_usage function
|
|
|
|
RH-Author: Eric Blake <eblake@redhat.com>
|
|
RH-MergeRequest: 363: blockdev-mirror: More efficient handling of sparse mirrors
|
|
RH-Jira: RHEL-88435 RHEL-88437
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Commit: [12/14] 0a007f9d09f01b50cf4edeb8ac8217356b2cb5d2 (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-88435
|
|
Jira: https://issues.redhat.com/browse/RHEL-88437
|
|
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.39.3
|
|
|