From: "Darrick J. Wong" <darrick.wong@oracle.com> To: eguan@redhat.com, darrick.wong@oracle.com Cc: ocfs2-devel@oss.oracle.com, fstests@vger.kernel.org Subject: [PATCH 4/7] reflink: fix space consumption tests Date: Sun, 11 Dec 2016 13:53:10 -0800 [thread overview] Message-ID: <148149319048.31093.2083894591825614863.stgit@birch.djwong.org> (raw) In-Reply-To: <148149316504.31093.16129068344227450710.stgit@birch.djwong.org> Some of the tests try to check that we can't COW when we're out of space, but some tricky filesystems make this hard because writing N blocks doesn't increase used blocks by N.... Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> --- common/populate | 14 ++++++++++++++ tests/generic/171 | 5 ++--- tests/generic/173 | 5 ++--- tests/generic/174 | 5 ++--- tests/generic/282 | 3 +-- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/common/populate b/common/populate index d0003c5..9811d21 100644 --- a/common/populate +++ b/common/populate @@ -30,6 +30,20 @@ _require_xfs_db_blocktrash_z_command() { $XFS_DB_PROG -x -f -c 'blocktrash -z' "${TEST_DEV}" | grep -q 'nothing on stack' || _notrun "blocktrash -z not supported" } +# Eat free space until we can't anymore. +_consume_free_space() { + dir=$1 + + old_nr_free=0 + nr_free=$(stat -f -c '%f' $dir) + x=0 + while [ $nr_free -gt 0 ] && [ $old_nr_free != $nr_free ]; do + $XFS_IO_PROG -f -c "pwrite -b 4194304 0 $((blksz * nr_free))" $dir/eat_my_space.$((x++)) + old_nr_free=$nr_free + nr_free=$(stat -f -c '%f' $dir) + done +} + # Attempt to make files of "every" format for data, dirs, attrs etc. # (with apologies to Eric Sandeen for mutating xfser.sh) diff --git a/tests/generic/171 b/tests/generic/171 index b01dbd5..d96fd17 100755 --- a/tests/generic/171 +++ b/tests/generic/171 @@ -41,6 +41,7 @@ _cleanup() . ./common/filter . ./common/attr . ./common/reflink +. ./common/populate # real QA test starts here _supported_os Linux @@ -75,9 +76,7 @@ _cp_reflink $testdir/bigfile $testdir/clonefile sync echo "Allocate the rest of the space" -nr_free=$(stat -f -c '%f' $testdir) -touch $testdir/file0 $testdir/file1 -_pwrite_byte 0x61 0 $((blksz * nr_free)) $testdir/eat_my_space >> $seqres.full 2>&1 +_consume_free_space $testdir >> $seqres.full 2>&1 sync echo "CoW the big file" diff --git a/tests/generic/173 b/tests/generic/173 index e35597f..20c6091 100755 --- a/tests/generic/173 +++ b/tests/generic/173 @@ -41,6 +41,7 @@ _cleanup() . ./common/filter . ./common/attr . ./common/reflink +. ./common/populate # real QA test starts here _supported_os Linux @@ -75,9 +76,7 @@ _cp_reflink $testdir/bigfile $testdir/clonefile sync echo "Allocate the rest of the space" -nr_free=$(stat -f -c '%f' $testdir) -touch $testdir/file0 $testdir/file1 -_pwrite_byte 0x61 0 $((blksz * nr_free)) $testdir/eat_my_space >> $seqres.full 2>&1 +_consume_free_space $testdir >> $seqres.full 2>&1 sync echo "mmap CoW the big file" diff --git a/tests/generic/174 b/tests/generic/174 index 38fad1d..d811307 100755 --- a/tests/generic/174 +++ b/tests/generic/174 @@ -41,6 +41,7 @@ _cleanup() . ./common/filter . ./common/attr . ./common/reflink +. ./common/populate # real QA test starts here _supported_os Linux @@ -76,9 +77,7 @@ _cp_reflink $testdir/bigfile $testdir/clonefile sync echo "Allocate the rest of the space" -nr_free=$(stat -f -c '%f' $testdir) -touch $testdir/file0 $testdir/file1 -_pwrite_byte 0x61 0 $((blksz * nr_free)) $testdir/eat_my_space >> $seqres.full 2>&1 +_consume_free_space $testdir >> $seqres.full 2>&1 sync echo "CoW the big file" diff --git a/tests/generic/282 b/tests/generic/282 index 6452025..8a30811 100755 --- a/tests/generic/282 +++ b/tests/generic/282 @@ -80,8 +80,7 @@ md5sum $testdir/file2 | _filter_scratch echo "CoW and unmount" sync _dmerror_load_error_table -urk=$($XFS_IO_PROG -f -c "mmap -rw 0 $filesize" -c "mwrite -S 0x63 0 $filesize" $testdir/file2 > $TEST_DIR/mwrite.out 2>&1) -cat $TEST_DIR/mwrite.out | tee -a $seqres.full +$XFS_IO_PROG -f -c "mmap -rw 0 $filesize" -c "mwrite -S 0x63 0 $filesize" $testdir/file2 >> $seqres.full 2>&1 _dmerror_load_working_table rm -rf $testdir/file2 >> $seqres.full 2>&1 _dmerror_unmount
WARNING: multiple messages have this Message-ID (diff)
From: Darrick J. Wong <darrick.wong@oracle.com> To: eguan@redhat.com, darrick.wong@oracle.com Cc: ocfs2-devel@oss.oracle.com, fstests@vger.kernel.org Subject: [Ocfs2-devel] [PATCH 4/7] reflink: fix space consumption tests Date: Sun, 11 Dec 2016 13:53:10 -0800 [thread overview] Message-ID: <148149319048.31093.2083894591825614863.stgit@birch.djwong.org> (raw) In-Reply-To: <148149316504.31093.16129068344227450710.stgit@birch.djwong.org> Some of the tests try to check that we can't COW when we're out of space, but some tricky filesystems make this hard because writing N blocks doesn't increase used blocks by N.... Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> --- common/populate | 14 ++++++++++++++ tests/generic/171 | 5 ++--- tests/generic/173 | 5 ++--- tests/generic/174 | 5 ++--- tests/generic/282 | 3 +-- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/common/populate b/common/populate index d0003c5..9811d21 100644 --- a/common/populate +++ b/common/populate @@ -30,6 +30,20 @@ _require_xfs_db_blocktrash_z_command() { $XFS_DB_PROG -x -f -c 'blocktrash -z' "${TEST_DEV}" | grep -q 'nothing on stack' || _notrun "blocktrash -z not supported" } +# Eat free space until we can't anymore. +_consume_free_space() { + dir=$1 + + old_nr_free=0 + nr_free=$(stat -f -c '%f' $dir) + x=0 + while [ $nr_free -gt 0 ] && [ $old_nr_free != $nr_free ]; do + $XFS_IO_PROG -f -c "pwrite -b 4194304 0 $((blksz * nr_free))" $dir/eat_my_space.$((x++)) + old_nr_free=$nr_free + nr_free=$(stat -f -c '%f' $dir) + done +} + # Attempt to make files of "every" format for data, dirs, attrs etc. # (with apologies to Eric Sandeen for mutating xfser.sh) diff --git a/tests/generic/171 b/tests/generic/171 index b01dbd5..d96fd17 100755 --- a/tests/generic/171 +++ b/tests/generic/171 @@ -41,6 +41,7 @@ _cleanup() . ./common/filter . ./common/attr . ./common/reflink +. ./common/populate # real QA test starts here _supported_os Linux @@ -75,9 +76,7 @@ _cp_reflink $testdir/bigfile $testdir/clonefile sync echo "Allocate the rest of the space" -nr_free=$(stat -f -c '%f' $testdir) -touch $testdir/file0 $testdir/file1 -_pwrite_byte 0x61 0 $((blksz * nr_free)) $testdir/eat_my_space >> $seqres.full 2>&1 +_consume_free_space $testdir >> $seqres.full 2>&1 sync echo "CoW the big file" diff --git a/tests/generic/173 b/tests/generic/173 index e35597f..20c6091 100755 --- a/tests/generic/173 +++ b/tests/generic/173 @@ -41,6 +41,7 @@ _cleanup() . ./common/filter . ./common/attr . ./common/reflink +. ./common/populate # real QA test starts here _supported_os Linux @@ -75,9 +76,7 @@ _cp_reflink $testdir/bigfile $testdir/clonefile sync echo "Allocate the rest of the space" -nr_free=$(stat -f -c '%f' $testdir) -touch $testdir/file0 $testdir/file1 -_pwrite_byte 0x61 0 $((blksz * nr_free)) $testdir/eat_my_space >> $seqres.full 2>&1 +_consume_free_space $testdir >> $seqres.full 2>&1 sync echo "mmap CoW the big file" diff --git a/tests/generic/174 b/tests/generic/174 index 38fad1d..d811307 100755 --- a/tests/generic/174 +++ b/tests/generic/174 @@ -41,6 +41,7 @@ _cleanup() . ./common/filter . ./common/attr . ./common/reflink +. ./common/populate # real QA test starts here _supported_os Linux @@ -76,9 +77,7 @@ _cp_reflink $testdir/bigfile $testdir/clonefile sync echo "Allocate the rest of the space" -nr_free=$(stat -f -c '%f' $testdir) -touch $testdir/file0 $testdir/file1 -_pwrite_byte 0x61 0 $((blksz * nr_free)) $testdir/eat_my_space >> $seqres.full 2>&1 +_consume_free_space $testdir >> $seqres.full 2>&1 sync echo "CoW the big file" diff --git a/tests/generic/282 b/tests/generic/282 index 6452025..8a30811 100755 --- a/tests/generic/282 +++ b/tests/generic/282 @@ -80,8 +80,7 @@ md5sum $testdir/file2 | _filter_scratch echo "CoW and unmount" sync _dmerror_load_error_table -urk=$($XFS_IO_PROG -f -c "mmap -rw 0 $filesize" -c "mwrite -S 0x63 0 $filesize" $testdir/file2 > $TEST_DIR/mwrite.out 2>&1) -cat $TEST_DIR/mwrite.out | tee -a $seqres.full +$XFS_IO_PROG -f -c "mmap -rw 0 $filesize" -c "mwrite -S 0x63 0 $filesize" $testdir/file2 >> $seqres.full 2>&1 _dmerror_load_working_table rm -rf $testdir/file2 >> $seqres.full 2>&1 _dmerror_unmount
next prev parent reply other threads:[~2016-12-11 21:53 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-12-11 21:52 [PATCH 0/7] xfstests: misc reflink test fixes Darrick J. Wong 2016-12-11 21:52 ` [Ocfs2-devel] " Darrick J. Wong 2016-12-11 21:52 ` [PATCH 1/7] ocfs2: test reflinking to inline data files Darrick J. Wong 2016-12-11 21:52 ` [Ocfs2-devel] " Darrick J. Wong 2016-12-12 9:01 ` Eryu Guan 2016-12-12 18:09 ` Darrick J. Wong 2016-12-12 18:09 ` [Ocfs2-devel] " Darrick J. Wong 2016-12-13 3:20 ` Eryu Guan 2016-12-13 7:11 ` Darrick J. Wong 2016-12-13 7:11 ` [Ocfs2-devel] " Darrick J. Wong 2016-12-13 21:35 ` Darrick J. Wong 2016-12-13 21:35 ` [Ocfs2-devel] " Darrick J. Wong 2016-12-14 7:32 ` Eric Ren 2016-12-14 7:32 ` [Ocfs2-devel] " Eric Ren 2016-12-11 21:52 ` [PATCH 2/7] ocfs2/reflink: fix file block size reporting Darrick J. Wong 2016-12-11 21:52 ` [Ocfs2-devel] " Darrick J. Wong 2016-12-12 9:48 ` Eryu Guan 2016-12-12 23:08 ` Darrick J. Wong 2016-12-12 23:08 ` [Ocfs2-devel] " Darrick J. Wong 2016-12-11 21:53 ` [PATCH 3/7] reflink: fix quota tests to work properly Darrick J. Wong 2016-12-11 21:53 ` [Ocfs2-devel] " Darrick J. Wong 2016-12-12 10:06 ` Eryu Guan 2016-12-12 23:08 ` Darrick J. Wong 2016-12-12 23:08 ` [Ocfs2-devel] " Darrick J. Wong 2016-12-11 21:53 ` Darrick J. Wong [this message] 2016-12-11 21:53 ` [Ocfs2-devel] [PATCH 4/7] reflink: fix space consumption tests Darrick J. Wong 2016-12-12 10:25 ` Eryu Guan 2016-12-12 23:03 ` Darrick J. Wong 2016-12-12 23:03 ` [Ocfs2-devel] " Darrick J. Wong 2016-12-13 3:22 ` Eryu Guan 2016-12-11 21:53 ` [PATCH 5/7] reflink: make error reporting consistent Darrick J. Wong 2016-12-11 21:53 ` [Ocfs2-devel] " Darrick J. Wong 2016-12-12 10:47 ` Eryu Guan 2016-12-12 23:06 ` Darrick J. Wong 2016-12-12 23:06 ` [Ocfs2-devel] " Darrick J. Wong 2016-12-11 21:53 ` [PATCH 6/7] reflink: don't test disjoint block sharing sets Darrick J. Wong 2016-12-11 21:53 ` [Ocfs2-devel] " Darrick J. Wong 2016-12-11 21:53 ` [PATCH 7/7] xfs/ext4: check negative inode size Darrick J. Wong 2016-12-11 21:53 ` [Ocfs2-devel] " Darrick J. Wong 2016-12-12 11:07 ` Eryu Guan 2016-12-13 21:49 ` Darrick J. Wong 2016-12-13 21:49 ` [Ocfs2-devel] " 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=148149319048.31093.2083894591825614863.stgit@birch.djwong.org \ --to=darrick.wong@oracle.com \ --cc=eguan@redhat.com \ --cc=fstests@vger.kernel.org \ --cc=ocfs2-devel@oss.oracle.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.