From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: eguan@redhat.com
Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org
Subject: [PATCH v3 12/14] generic/204: break out of fs-filling loop early if we ENOSPC
Date: Mon, 6 Nov 2017 17:54:11 -0800 [thread overview]
Message-ID: <20171107015411.GA28335@magnolia> (raw)
In-Reply-To: <150957286222.18388.3253654888670864191.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
Use the available block count to compute the number of files we think
we can create, rather than hardcoding a particular size. This fixes
the ENOSPC failures for xfs filesystems with rmap/reflink support.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
v3: factor in space used for file names
---
tests/generic/204 | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/tests/generic/204 b/tests/generic/204
index 4c203a2..71bee83 100755
--- a/tests/generic/204
+++ b/tests/generic/204
@@ -69,7 +69,7 @@ _scratch_mount
# work out correctly. Space usages is based 22500 files and 1024 reserved blocks
# on a 4k block size 256 byte inode size filesystem.
resv_blks=1024
-space=97920000
+space=$(stat -f -c '%f * %S' $SCRATCH_MNT | $BC_PROG)
# decrease files for inode size.
# 22500 * (256 + 4k) = ~97MB
@@ -78,10 +78,20 @@ space=97920000
files=$((space / (isize + dbsize)))
+# Now do it again, but factor in the filename sizes too.
+# We naïvely assume 8 bytes for inode number, 1 byte for ftype,
+# and 1 more byte for namelen, then round up to the nearest 8
+# bytes.
+
+namelen="$(echo -n "$files" | wc -c)"
+direntlen="$(echo "(10 + $namelen + 7) / 8 * 8" | $BC_PROG)"
+
+files=$((space / (direntlen + isize + dbsize)))
+
echo files $files, resvblks $resv_blks >> $seqres.full
_scratch_resvblks $resv_blks >> $seqres.full 2>&1
-for i in `seq 1 $files`; do
+for i in `seq -w 1 $files`; do
echo -n > $SCRATCH_MNT/$i
echo XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX > $SCRATCH_MNT/$i
done
next prev parent reply other threads:[~2017-11-07 1:54 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-01 21:46 [PATCH 00/14] rollup of fstests fixes Darrick J. Wong
2017-11-01 21:46 ` [PATCH 01/14] common/xfs: refactor xfs_scrub presence testing Darrick J. Wong
2017-11-03 11:10 ` Eryu Guan
2017-11-03 16:29 ` Darrick J. Wong
2017-11-01 21:46 ` [PATCH 02/14] common/xfs: standardize the xfs_scrub output that gets recorded to $seqres.full Darrick J. Wong
2017-11-01 21:46 ` [PATCH 03/14] misc: add module reloading helpers Darrick J. Wong
2017-11-01 21:46 ` [PATCH 04/14] xfs: test that we don't leak inodes and dquots during failed cow recovery Darrick J. Wong
2017-11-01 21:46 ` [PATCH 05/14] xfs/333: fix errors with new inode pointer verifiers Darrick J. Wong
2017-11-01 21:47 ` [PATCH 06/14] generic/459: fix test running errors Darrick J. Wong
2017-11-01 21:47 ` [PATCH 07/14] generic/459: explicitly require thin_check Darrick J. Wong
2017-11-02 12:25 ` Eryu Guan
2017-11-02 16:49 ` Darrick J. Wong
2017-11-01 21:47 ` [PATCH 08/14] common/xfs: remove inode-paths cruft Darrick J. Wong
2017-11-01 21:47 ` [PATCH 09/14] xfs/348: dir->symlink corruption must not be allowed Darrick J. Wong
2017-11-02 12:42 ` Eryu Guan
2017-11-02 13:14 ` Amir Goldstein
2017-11-02 16:39 ` Darrick J. Wong
2017-11-02 18:11 ` Amir Goldstein
2017-11-02 16:37 ` Darrick J. Wong
2017-11-03 4:30 ` Eryu Guan
2017-11-03 16:14 ` Theodore Ts'o
2017-11-03 16:30 ` Darrick J. Wong
2017-11-01 21:47 ` [PATCH 10/14] xfs/122: add inode log formats Darrick J. Wong
2017-11-01 21:47 ` [PATCH 11/14] xfs/010: filter and record the unknown block state messages Darrick J. Wong
2017-11-01 21:47 ` [PATCH 12/14] generic/204: break out of fs-filling loop early if we ENOSPC Darrick J. Wong
2017-11-02 14:23 ` Eryu Guan
2017-11-02 21:01 ` Darrick J. Wong
2017-11-03 4:26 ` [PATCH v2 12/14] generic/204: use available blocks to determine the number of files to create Darrick J. Wong
2017-11-04 5:25 ` Eryu Guan
2017-11-07 1:54 ` Darrick J. Wong [this message]
2017-11-07 7:17 ` [PATCH v3 12/14] generic/204: break out of fs-filling loop early if we ENOSPC Christoph Hellwig
2017-11-01 21:47 ` [PATCH 13/14] xfs/013: don't fail because cp ran out of space Darrick J. Wong
2017-11-01 21:47 ` [PATCH 14/14] generic: test IO at maximum file offset Darrick J. Wong
2017-11-02 15:16 ` Eryu Guan
2017-11-02 16:45 ` Darrick J. Wong
2017-11-03 4:27 ` [PATCH v2 " Darrick J. Wong
2017-11-03 5:33 ` Eryu Guan
2017-11-03 16:00 ` Darrick J. Wong
2017-11-02 3:06 ` [PATCH 00/14] rollup of fstests fixes Eryu Guan
2017-11-02 4:44 ` Darrick J. Wong
2017-11-03 4:28 ` [PATCH 15/14] xfs/020: check that we have enough space to write out a huge fs Darrick J. Wong
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=20171107015411.GA28335@magnolia \
--to=darrick.wong@oracle.com \
--cc=eguan@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).