public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
From: Zorro Lang <zlang@redhat.com>
To: fstests@vger.kernel.org
Subject: [PATCH] xfs: limit xfs_growfs size if test with --large-fs
Date: Fri, 27 Apr 2018 16:22:54 +0800	[thread overview]
Message-ID: <20180427082254.25524-1-zlang@redhat.com> (raw)

When test on large SCRATCH_DEV, grow a small XFS to huge size is a
horrible thing (e.g grow 128m to 500T). So add a helper named
_scratch_xfs_growfs_limited() to do below things:

1) If --large-fs is used, limit growfs size.
2) If a limit size parameter is specified, make sure growfs won't
beyond this size.

Signed-off-by: Zorro Lang <zlang@redhat.com>
---
 common/xfs    | 34 ++++++++++++++++++++++++++++++++++
 tests/xfs/002 |  2 +-
 tests/xfs/127 |  2 +-
 tests/xfs/233 |  2 +-
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/common/xfs b/common/xfs
index e0bc3f43..6200297c 100644
--- a/common/xfs
+++ b/common/xfs
@@ -721,3 +721,37 @@ _require_xfs_db_write_array()
 	rm -f $TEST_DIR/$seq.img
 	[ $supported -eq 0 ] && _notrun "xfs_db write can't support array"
 }
+
+# If test on large device or a limit size is specified, this helper make sure
+# xfs_growfs won't beyond this limit (try to grow 10 times current fs size by
+# default).
+#   usage: _scratch_xfs_growfs_limited [size_by_byte]
+_scratch_xfs_growfs_limited()
+{
+
+	local limit_size="$1"
+	local option=""
+
+	if [ "$LARGE_SCRATCH_DEV" = "yes" -o -n "$limit_size" ]; then
+		local tmp=`mktemp -u`
+		xfs_info $SCRATCH_MNT | _filter_mkfs > /dev/null 2>$tmp.info
+		. $tmp.info
+		rm -f $tmp.info
+
+		local fs_size=$((dbsize * dblocks))
+		local dev_size_kb=`_get_device_size $SCRATCH_DEV`
+
+		# default limit_size is 10 times current fs size.
+		if [ -z "$limit_size" ]; then
+			limit_size=$((fs_size * 10))
+		fi
+		# don't limit growfs size if device size is smaller
+		if [ $((dev_size_kb * 1024)) -gt $limit_size ]; then
+			option="-D $((limit_size / dbsize))"
+		else
+			option=""
+		fi
+	fi
+
+	$XFS_GROWFS_PROG $option $SCRATCH_MNT
+}
diff --git a/tests/xfs/002 b/tests/xfs/002
index 741117be..42d2e2d7 100755
--- a/tests/xfs/002
+++ b/tests/xfs/002
@@ -68,7 +68,7 @@ _scratch_xfs_db -x -c "sb 2" -c "type data" -c "write fill 0xff 224 4"
 _scratch_mount
 
 # This should pass
-$XFS_GROWFS_PROG $SCRATCH_MNT >> $seqres.full 2>&1 || _fail "growfs failed"
+_scratch_xfs_growfs_limited >> $seqres.full 2>&1 || _fail "growfs failed"
 
 # success, all done
 status=0
diff --git a/tests/xfs/127 b/tests/xfs/127
index 9df99904..c05fcee9 100755
--- a/tests/xfs/127
+++ b/tests/xfs/127
@@ -61,7 +61,7 @@ _cp_reflink $testdir/original $testdir/copy1
 _cp_reflink $testdir/copy1 $testdir/copy2
 
 echo "Grow fs"
-$XFS_GROWFS_PROG $SCRATCH_MNT 2>&1 |  _filter_growfs >> $seqres.full
+_scratch_xfs_growfs_limited 2>&1 | _filter_growfs >> $seqres.full
 _scratch_cycle_mount
 
 echo "Create more reflink copies"
diff --git a/tests/xfs/233 b/tests/xfs/233
index e61c444d..a0dd42e7 100755
--- a/tests/xfs/233
+++ b/tests/xfs/233
@@ -59,7 +59,7 @@ cp -p $testdir/original $testdir/copy1
 cp -p $testdir/copy1 $testdir/copy2
 
 echo "Grow fs"
-$XFS_GROWFS_PROG $SCRATCH_MNT 2>&1 |  _filter_growfs >> $seqres.full
+_scratch_xfs_growfs_limited 2>&1 |  _filter_growfs >> $seqres.full
 _scratch_cycle_mount
 
 echo "Create more copies"
-- 
2.14.3


             reply	other threads:[~2018-04-27  8:22 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-27  8:22 Zorro Lang [this message]
2018-05-09 16:02 ` [PATCH] xfs: limit xfs_growfs size if test with --large-fs Eryu Guan
2018-05-09 16:22   ` Darrick J. Wong
2018-05-10 22:18 ` Dave Chinner
2018-05-11  3:41   ` Zorro Lang
2018-05-11 23:29     ` Dave Chinner
2018-05-12  0:15       ` Darrick J. Wong
2018-05-12  5:53     ` Eryu Guan
2018-05-12 13:19       ` Zorro Lang

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=20180427082254.25524-1-zlang@redhat.com \
    --to=zlang@redhat.com \
    --cc=fstests@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