On Mon 26 Feb 2024 at 00:22, Zorro Lang <zlang@xxxxxxxxxx> wrote:
On Fri, Feb 16, 2024 at 06:25:50PM +0800, Su Yue wrote:
From: Su Yue <glass.su@xxxxxxxx>
Because block group tree requires require no-holes feature,
_log_writes_mkfs "-O ^no-holes" fails when "-O
block-group-tree" is
given in MKFS_OPTION.
Without explicit _log_writes_cleanup, the two tests fail with
logwrites-test device left. And all next tests will fail due to
SCRATCH DEVICE EBUSY.
Fix it by overriding _cleanup to call _log_writes_cleanup.
Signed-off-by: Su Yue <glass.su@xxxxxxxx>
Reviewed-by: Filipe Manana <fdmanana@xxxxxxxx>
Reviewed-by: Qu Wenruo <wqu@xxxxxxxx>
---
changelog:
v2:
Remove unneeded comments for _cleanup.
Add rvbs.
---
tests/btrfs/172 | 5 +++++
tests/btrfs/206 | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/tests/btrfs/172 b/tests/btrfs/172
index f5acc6982cd7..e5e16681ec21 100755
--- a/tests/btrfs/172
+++ b/tests/btrfs/172
@@ -13,6 +13,11 @@
. ./common/preamble
_begin_fstest auto quick log replay recoveryloop
+_cleanup()
+{
+ _log_writes_cleanup &> /dev/null
Currently we need to copy the code in default _cleanup into new
_cleanup()
function, if you need a override, e.g.
Sorry for the late reply, I was working on other things with
headache.
I saw the cleanup thing you mentioned in v1 thread. v3 was sent.
Thanks.
--
Su
cd /
_log_writes_cleanup
rm -f $tmp.*
+}
+
# Import common functions.
. ./common/filter
. ./common/dmlogwrites
diff --git a/tests/btrfs/206 b/tests/btrfs/206
index f6571649076f..d9ce33b659e7 100755
--- a/tests/btrfs/206
+++ b/tests/btrfs/206
@@ -14,6 +14,11 @@
. ./common/preamble
_begin_fstest auto quick log replay recoveryloop punch
prealloc
+_cleanup()
+{
+ _log_writes_cleanup &> /dev/null
+}
+
# Import common functions.
. ./common/filter
. ./common/dmlogwrites
--
2.43.0
