From: Murphy Zhou <jencce.kernel@gmail.com>
To: fstests@vger.kernel.org
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH v3 3/4] tests/xfs: remove single-AG options
Date: Tue, 30 Aug 2022 12:44:32 +0800 [thread overview]
Message-ID: <20220830044433.1719246-4-jencce.kernel@gmail.com> (raw)
In-Reply-To: <20220830044433.1719246-1-jencce.kernel@gmail.com>
Since this xfsprogs commit:
6e0ed3d19c54 mkfs: stop allowing tiny filesystems
Single-AG xfs is not allowed.
Remove agcount=1 from mkfs options and xfs/202 entirely.
Signed-off-by: Murphy Zhou <jencce.kernel@gmail.com>
---
tests/xfs/179 | 2 +-
tests/xfs/202 | 40 ----------------------------------------
tests/xfs/202.out | 29 -----------------------------
tests/xfs/520 | 2 +-
4 files changed, 2 insertions(+), 71 deletions(-)
delete mode 100755 tests/xfs/202
delete mode 100644 tests/xfs/202.out
diff --git a/tests/xfs/179 b/tests/xfs/179
index ec0cb7e5..f0169717 100755
--- a/tests/xfs/179
+++ b/tests/xfs/179
@@ -22,7 +22,7 @@ _require_cp_reflink
_require_test_program "punch-alternating"
echo "Format and mount"
-_scratch_mkfs -d agcount=1 > $seqres.full 2>&1
+_scratch_mkfs > $seqres.full 2>&1
_scratch_mount >> $seqres.full 2>&1
testdir=$SCRATCH_MNT/test-$seq
diff --git a/tests/xfs/202 b/tests/xfs/202
deleted file mode 100755
index 5075d3a1..00000000
--- a/tests/xfs/202
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/bash
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (c) 2009 Christoph Hellwig.
-#
-# FS QA Test No. 202
-#
-# Test out the xfs_repair -o force_geometry option on single-AG filesystems.
-#
-. ./common/preamble
-_begin_fstest repair auto quick
-
-# Import common functions.
-. ./common/filter
-. ./common/repair
-
-# real QA test starts here
-_supported_fs xfs
-
-# single AG will cause default xfs_repair to fail. This test is actually
-# testing the special corner case option needed to repair a single AG fs.
-_require_scratch_nocheck
-
-#
-# The AG size is limited to 1TB (or even less with historic xfsprogs),
-# so chose a small enough filesystem to make sure we can actually create
-# a single AG filesystem.
-#
-echo "== Creating single-AG filesystem =="
-_scratch_mkfs_xfs -d agcount=1 -d size=$((1024*1024*1024)) >/dev/null 2>&1 \
- || _fail "!!! failed to make filesystem with single AG"
-
-echo "== Trying to repair it (should fail) =="
-_scratch_xfs_repair
-
-echo "== Trying to repair it with -o force_geometry =="
-_scratch_xfs_repair -o force_geometry 2>&1 | _filter_repair
-
-# success, all done
-echo "*** done"
-status=0
diff --git a/tests/xfs/202.out b/tests/xfs/202.out
deleted file mode 100644
index c2c5c881..00000000
--- a/tests/xfs/202.out
+++ /dev/null
@@ -1,29 +0,0 @@
-QA output created by 202
-== Creating single-AG filesystem ==
-== Trying to repair it (should fail) ==
-Phase 1 - find and verify superblock...
-Only one AG detected - cannot validate filesystem geometry.
-Use the -o force_geometry option to proceed.
-== Trying to repair it with -o force_geometry ==
-Phase 1 - find and verify superblock...
-Phase 2 - using <TYPEOF> log
- - zero log...
- - scan filesystem freespace and inode maps...
- - found root inode chunk
-Phase 3 - for each AG...
- - scan and clear agi unlinked lists...
- - process known inodes and perform inode discovery...
- - process newly discovered inodes...
-Phase 4 - check for duplicate blocks...
- - setting up duplicate extent list...
- - check for inodes claiming duplicate blocks...
-Phase 5 - rebuild AG headers and trees...
- - reset superblock...
-Phase 6 - check inode connectivity...
- - resetting contents of realtime bitmap and summary inodes
- - traversing filesystem ...
- - traversal finished ...
- - moving disconnected inodes to lost+found ...
-Phase 7 - verify and correct link counts...
-done
-*** done
diff --git a/tests/xfs/520 b/tests/xfs/520
index d9e252bd..de70db60 100755
--- a/tests/xfs/520
+++ b/tests/xfs/520
@@ -60,7 +60,7 @@ force_crafted_metadata() {
}
bigval=100000000
-fsdsopt="-d agcount=1,size=512m"
+fsdsopt="-d size=512m"
force_crafted_metadata freeblks 0 "agf 0"
force_crafted_metadata longest $bigval "agf 0"
--
2.31.1
next prev parent reply other threads:[~2022-08-30 4:44 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-30 4:44 [PATCH v3 0/4] tweaks for denying tiny xfs Murphy Zhou
2022-08-30 4:44 ` [PATCH v3 1/4] tests: increase fs size for mkfs Murphy Zhou
2022-08-30 7:36 ` Zorro Lang
2022-08-30 14:46 ` Darrick J. Wong
2022-08-30 19:07 ` Zorro Lang
2022-08-31 0:18 ` Murphy Zhou
2022-08-31 1:53 ` Murphy Zhou
2022-08-31 5:04 ` Zorro Lang
2022-08-31 9:34 ` Murphy Zhou
2022-08-30 4:44 ` [PATCH v3 2/4] tests: increase xfs log size Murphy Zhou
2022-08-30 4:44 ` Murphy Zhou [this message]
2022-08-30 13:42 ` [PATCH v3 3/4] tests/xfs: remove single-AG options Zorro Lang
2022-08-31 0:02 ` Murphy Zhou
2022-08-30 15:05 ` Darrick J. Wong
2022-08-31 0:10 ` Murphy Zhou
2022-08-30 4:44 ` [PATCH v3 4/4] xfs/144: remove testing root dir inode in AG 1 Murphy Zhou
2022-08-30 7:49 ` Zorro Lang
2022-08-30 14:59 ` Darrick J. Wong
2022-08-30 23:45 ` Murphy Zhou
2022-08-30 23:42 ` Murphy Zhou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220830044433.1719246-4-jencce.kernel@gmail.com \
--to=jencce.kernel@gmail.com \
--cc=fstests@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).