From: Donald Douwsma <ddouwsma@redhat.com>
To: linux-xfs@vger.kernel.org, fstests@vger.kernel.org
Cc: Donald Douwsma <ddouwsma@redhat.com>
Subject: [PATCH] xfstests: add test for xfs_repair progress reporting
Date: Tue, 19 May 2020 16:55:12 +1000 [thread overview]
Message-ID: <20200519065512.232760-1-ddouwsma@redhat.com> (raw)
xfs_repair's interval based progress has been broken for
some time, create a test based on dmdelay to stretch out
the time and use ag_stride to force parallelism.
Signed-off-by: Donald Douwsma <ddouwsma@redhat.com>
---
tests/xfs/516 | 72 +++++++++++++++++++++++++++++++++++++++++++++++
tests/xfs/516.out | 15 ++++++++++
tests/xfs/group | 1 +
3 files changed, 88 insertions(+)
create mode 100755 tests/xfs/516
create mode 100644 tests/xfs/516.out
diff --git a/tests/xfs/516 b/tests/xfs/516
new file mode 100755
index 00000000..5ad57fbc
--- /dev/null
+++ b/tests/xfs/516
@@ -0,0 +1,72 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2020 Red Hat, Inc. All Rights Reserved.
+#
+# FS QA Test 516
+#
+# Test xfs_repair's progress reporting
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+ cd /
+ _dmsetup_remove delay-test > /dev/null 2>&1
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+. ./common/dmdelay
+. ./common/populate
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+# Modify as appropriate.
+_supported_fs xfs
+_supported_os Linux
+_require_scratch
+_require_dm_target delay
+
+# Filter output specific to the formatters in xfs_repair/progress.c
+# Ideally we'd like to see hits on anything that matches
+# awk '/{FMT/' repair/progress.c
+_filter_repair()
+{
+ sed -ne '
+ s/[0-9]\+/#/g;
+ /#:#:#:/p
+ '
+}
+
+echo "Format and populate"
+_scratch_populate_cached nofill > $seqres.full 2>&1
+
+echo "Introduce a dmdelay"
+_init_delay
+
+# Introduce a read I/O delay
+# The default in common/dmdelay is a bit too agressive
+BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV`
+DELAY_TABLE_RDELAY="0 $BLK_DEV_SIZE delay $SCRATCH_DEV 0 100 $SCRATCH_DEV 0 0"
+_load_delay_table $DELAY_READ
+
+echo "Run repair"
+$XFS_REPAIR_PROG -o ag_stride=4 -t 1 $DELAY_DEV >> $seqres.full 2>&1
+cat $seqres.full | _filter_repair | sort -u
+
+_cleanup_delay
+
+# success, all done
+status=0
+exit
diff --git a/tests/xfs/516.out b/tests/xfs/516.out
new file mode 100644
index 00000000..bc824d7f
--- /dev/null
+++ b/tests/xfs/516.out
@@ -0,0 +1,15 @@
+QA output created by 516
+Format and populate
+Introduce a dmdelay
+Run repair
+ - #:#:#: Phase #: #% done - estimated remaining time # minutes, # seconds
+ - #:#:#: Phase #: elapsed time # second - processed # inodes per minute
+ - #:#:#: Phase #: elapsed time # seconds - processed # inodes per minute
+ - #:#:#: check for inodes claiming duplicate blocks - # of # inodes done
+ - #:#:#: process known inodes and inode discovery - # of # inodes done
+ - #:#:#: process newly discovered inodes - # of # allocation groups done
+ - #:#:#: rebuild AG headers and trees - # of # allocation groups done
+ - #:#:#: scanning agi unlinked lists - # of # allocation groups done
+ - #:#:#: scanning filesystem freespace - # of # allocation groups done
+ - #:#:#: setting up duplicate extent list - # of # allocation groups done
+ - #:#:#: verify and correct link counts - # of # allocation groups done
diff --git a/tests/xfs/group b/tests/xfs/group
index 12eb55c9..aeeca23f 100644
--- a/tests/xfs/group
+++ b/tests/xfs/group
@@ -513,3 +513,4 @@
513 auto mount
514 auto quick db
515 auto quick quota
+516 repair
--
2.18.4
next reply other threads:[~2020-05-19 6:55 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-19 6:55 Donald Douwsma [this message]
2020-05-19 16:01 ` [PATCH] xfstests: add test for xfs_repair progress reporting Darrick J. Wong
2020-05-20 1:11 ` Donald Douwsma
2020-05-20 3:52 ` [PATCH v2] " Donald Douwsma
2020-05-20 15:55 ` Darrick J. Wong
2020-05-24 16:46 ` Eryu Guan
2020-05-24 17:18 ` Darrick J. Wong
2020-08-17 7:49 ` Donald Douwsma
2020-08-17 7:53 ` [PATCH v3] " Donald Douwsma
2020-08-30 15:57 ` Eryu Guan
2020-09-02 9:04 ` Donald Douwsma
2020-05-29 8:06 ` [PATCH v2] " Zorro Lang
2020-06-01 0:53 ` Donald Douwsma
2020-06-01 3:55 ` Donald Douwsma
2020-06-11 5:03 ` Zorro Lang
2020-08-17 6:25 ` Donald Douwsma
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=20200519065512.232760-1-ddouwsma@redhat.com \
--to=ddouwsma@redhat.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).