linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: david@fromorbit.com, darrick.wong@oracle.com
Cc: linux-ext4@vger.kernel.org, fstests@vger.kernel.org,
	linux-btrfs@vger.kernel.org, xfs@oss.sgi.com
Subject: [PATCH 03/12] reflink: fix fragmentation tests to work on >4k block size filesystems
Date: Fri, 04 Mar 2016 16:37:37 -0800	[thread overview]
Message-ID: <20160305003737.28738.35234.stgit@birch.djwong.org> (raw)
In-Reply-To: <20160305003717.28738.98818.stgit@birch.djwong.org>

For tests that only overwrite part of a file, only consider the number
of extents in the *rewritten* blocks when deciding if the FS
fragmentation performance is satisfactory.

(Also slip in a fix for xfs/127 so that it formats correctly when we
specify big blocksizes via MKFS_OPTIONS.)

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tests/xfs/127 |    2 +-
 tests/xfs/215 |    2 +-
 tests/xfs/218 |    2 +-
 tests/xfs/219 |    2 +-
 tests/xfs/221 |    2 +-
 tests/xfs/223 |    2 +-
 tests/xfs/224 |    2 +-
 tests/xfs/225 |    2 +-
 tests/xfs/226 |    2 +-
 tests/xfs/228 |    2 +-
 tests/xfs/230 |    2 +-
 tests/xfs/231 |    2 +-
 tests/xfs/232 |    2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)


diff --git a/tests/xfs/127 b/tests/xfs/127
index f44daae..6b768c9 100755
--- a/tests/xfs/127
+++ b/tests/xfs/127
@@ -48,7 +48,7 @@ _require_scratch_reflink
 _require_cp_reflink
 
 echo "Format and mount"
-_scratch_mkfs -d size=$((2 * 4096 * 4096)) -l size=4194304 > $seqres.full 2>&1
+_scratch_mkfs_sized $((2 * 4096 * 4096)) > $seqres.full 2>&1
 _scratch_mount >> $seqres.full 2>&1
 
 testdir=$SCRATCH_MNT/test-$seq
diff --git a/tests/xfs/215 b/tests/xfs/215
index 5ae4d85..7a517d7 100755
--- a/tests/xfs/215
+++ b/tests/xfs/215
@@ -95,7 +95,7 @@ new_extents=$(_count_extents $testdir/file3)
 echo "old extents: $old_extents" >> $seqres.full
 echo "new extents: $new_extents" >> $seqres.full
 echo "maximum extents: $internal_blks" >> $seqres.full
-test $new_extents -lt $((internal_blks / 20)) || echo "file3 badly fragmented"
+test $((new_extents - (nr / 2))) -lt $((internal_blks / 2)) || echo "file3 badly fragmented"
 
 # success, all done
 status=0
diff --git a/tests/xfs/218 b/tests/xfs/218
index ea464f2..0ab4102 100755
--- a/tests/xfs/218
+++ b/tests/xfs/218
@@ -94,7 +94,7 @@ new_extents=$(_count_extents $testdir/file3)
 echo "old extents: $old_extents" >> $seqres.full
 echo "new extents: $new_extents" >> $seqres.full
 echo "maximum extents: $internal_blks" >> $seqres.full
-test $new_extents -lt $((internal_blks / 20)) || echo "file3 badly fragmented"
+test $((new_extents - (nr / 2))) -lt $((internal_blks / 2)) || echo "file3 badly fragmented"
 
 # success, all done
 status=0
diff --git a/tests/xfs/219 b/tests/xfs/219
index 012b07c..df57e07 100755
--- a/tests/xfs/219
+++ b/tests/xfs/219
@@ -95,7 +95,7 @@ new_extents=$(_count_extents $testdir/file3)
 echo "old extents: $old_extents" >> $seqres.full
 echo "new extents: $new_extents" >> $seqres.full
 echo "maximum extents: $internal_blks" >> $seqres.full
-test $new_extents -lt $((internal_blks / 20)) || echo "file3 badly fragmented"
+test $((new_extents - (nr / 4))) -lt $((internal_blks / 2)) || echo "file3 badly fragmented"
 
 # success, all done
 status=0
diff --git a/tests/xfs/221 b/tests/xfs/221
index 8b860f2..03d81ac 100755
--- a/tests/xfs/221
+++ b/tests/xfs/221
@@ -94,7 +94,7 @@ new_extents=$(_count_extents $testdir/file3)
 echo "old extents: $old_extents" >> $seqres.full
 echo "new extents: $new_extents" >> $seqres.full
 echo "maximum extents: $internal_blks" >> $seqres.full
-test $new_extents -lt $((internal_blks / 20)) || echo "file3 badly fragmented"
+test $((new_extents - (nr / 4))) -lt $((internal_blks / 2)) || echo "file3 badly fragmented"
 
 # success, all done
 status=0
diff --git a/tests/xfs/223 b/tests/xfs/223
index 1e6ba98..7c990a2 100755
--- a/tests/xfs/223
+++ b/tests/xfs/223
@@ -97,7 +97,7 @@ new_extents=$(_count_extents $testdir/file3)
 echo "old extents: $old_extents" >> $seqres.full
 echo "new extents: $new_extents" >> $seqres.full
 echo "maximum extents: $internal_blks" >> $seqres.full
-test $new_extents -lt $((internal_blks / 20)) || echo "file3 badly fragmented"
+test $((new_extents - (nr / 2))) -lt $((internal_blks / 2)) || echo "file3 badly fragmented"
 
 # success, all done
 status=0
diff --git a/tests/xfs/224 b/tests/xfs/224
index 3d19f94..bf33d1f 100755
--- a/tests/xfs/224
+++ b/tests/xfs/224
@@ -96,7 +96,7 @@ new_extents=$(_count_extents $testdir/file3)
 echo "old extents: $old_extents" >> $seqres.full
 echo "new extents: $new_extents" >> $seqres.full
 echo "maximum extents: $internal_blks" >> $seqres.full
-test $new_extents -lt $((internal_blks / 20)) || echo "file3 badly fragmented"
+test $((new_extents - (nr / 2))) -lt $((internal_blks / 2)) || echo "file3 badly fragmented"
 
 # success, all done
 status=0
diff --git a/tests/xfs/225 b/tests/xfs/225
index c2e5b82..749816f 100755
--- a/tests/xfs/225
+++ b/tests/xfs/225
@@ -95,7 +95,7 @@ new_extents=$(_count_extents $testdir/file3)
 echo "old extents: $old_extents" >> $seqres.full
 echo "new extents: $new_extents" >> $seqres.full
 echo "maximum extents: $internal_blks" >> $seqres.full
-test $new_extents -lt $((internal_blks / 20)) || echo "file3 badly fragmented"
+test $((new_extents - (nr / 2))) -lt $((internal_blks / 2)) || echo "file3 badly fragmented"
 
 # success, all done
 status=0
diff --git a/tests/xfs/226 b/tests/xfs/226
index 3f035b4..bb94d24 100755
--- a/tests/xfs/226
+++ b/tests/xfs/226
@@ -94,7 +94,7 @@ new_extents=$(_count_extents $testdir/file3)
 echo "old extents: $old_extents" >> $seqres.full
 echo "new extents: $new_extents" >> $seqres.full
 echo "maximum extents: $internal_blks" >> $seqres.full
-test $new_extents -lt $((internal_blks / 20)) || echo "file3 badly fragmented"
+test $((new_extents - (nr / 2))) -lt $((internal_blks / 2)) || echo "file3 badly fragmented"
 
 # success, all done
 status=0
diff --git a/tests/xfs/228 b/tests/xfs/228
index 52fbb75..df1fd7a 100755
--- a/tests/xfs/228
+++ b/tests/xfs/228
@@ -103,7 +103,7 @@ new_extents=$(_count_extents $testdir/file3)
 echo "old extents: $old_extents" >> $seqres.full
 echo "new extents: $new_extents" >> $seqres.full
 echo "maximum extents: $internal_blks" >> $seqres.full
-test $new_extents -lt $((internal_blks / 20)) || echo "file3 badly fragmented"
+test $((new_extents - (nr * 4 / 10))) -lt $((internal_blks / 2)) || echo "file3 badly fragmented"
 
 # success, all done
 status=0
diff --git a/tests/xfs/230 b/tests/xfs/230
index 91e4d3f..73f599a 100755
--- a/tests/xfs/230
+++ b/tests/xfs/230
@@ -103,7 +103,7 @@ new_extents=$(_count_extents $testdir/file3)
 echo "old extents: $old_extents" >> $seqres.full
 echo "new extents: $new_extents" >> $seqres.full
 echo "maximum extents: $internal_blks" >> $seqres.full
-test $new_extents -lt $((internal_blks / 20)) || echo "file3 badly fragmented"
+test $((new_extents - (nr * 4 / 10))) -lt $((internal_blks / 2)) || echo "file3 badly fragmented"
 
 # success, all done
 status=0
diff --git a/tests/xfs/231 b/tests/xfs/231
index 60f59a9..166f6b0 100755
--- a/tests/xfs/231
+++ b/tests/xfs/231
@@ -123,7 +123,7 @@ new_extents=$(_count_extents $testdir/file2)
 echo "old extents: $old_extents" >> $seqres.full
 echo "new extents: $new_extents" >> $seqres.full
 echo "maximum extents: $internal_blks" >> $seqres.full
-test $new_extents -lt $((internal_blks / 7)) || echo "file2 badly fragmented"
+test $new_extents -le $((3 * nr / bufnr)) || echo "file2 more fragmented than expected"
 
 # success, all done
 status=0
diff --git a/tests/xfs/232 b/tests/xfs/232
index 9a8403c..0008dbf 100755
--- a/tests/xfs/232
+++ b/tests/xfs/232
@@ -125,7 +125,7 @@ new_extents=$(_count_extents $testdir/file2)
 echo "old extents: $old_extents" >> $seqres.full
 echo "new extents: $new_extents" >> $seqres.full
 echo "maximum extents: $internal_blks" >> $seqres.full
-test $new_extents -lt $((internal_blks / 12)) || echo "file2 not sufficiently fragmented"
+test $new_extents -le $((2 * nr / bufnr)) || echo "file2 more fragmented than expected"
 
 # success, all done
 status=0

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

  parent reply	other threads:[~2016-03-05  0:37 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-05  0:37 [PATCH v5 00/12] xfstests: minor fixes for the reflink/dedupe tests Darrick J. Wong
2016-03-05  0:37 ` [PATCH 01/12] xfs/207: fix golden output to match FS_IOC_FSSETXATTR hoist Darrick J. Wong
2016-03-05 20:16   ` Christoph Hellwig
2016-03-05  0:37 ` [PATCH 02/12] xfs: test copy-on-write leftover recovery Darrick J. Wong
2016-03-05 20:17   ` Christoph Hellwig
2016-03-05  0:37 ` Darrick J. Wong [this message]
2016-03-05 20:17   ` [PATCH 03/12] reflink: fix fragmentation tests to work on >4k block size filesystems Christoph Hellwig
2016-03-05  0:37 ` [PATCH 04/12] xfs/23[3-6]: don't source common/xfs, it doesn't exist Darrick J. Wong
2016-03-05 20:19   ` Christoph Hellwig
2016-03-05  0:37 ` [PATCH 05/12] xfs/206: fix output when mkfs knows about reflink Darrick J. Wong
2016-03-05 20:19   ` Christoph Hellwig
2016-03-05  0:37 ` [PATCH 06/12] xfs/030: fix output on newer filesystems Darrick J. Wong
2016-03-05 20:20   ` Christoph Hellwig
2016-03-23  3:40     ` Dave Chinner
2016-03-05  0:38 ` [PATCH 07/12] xfs/073: fix output Darrick J. Wong
2016-03-05 20:22   ` Christoph Hellwig
2016-03-05  0:38 ` [PATCH 08/12] xfs/122: define _GNU_SOURCE when compiling test program Darrick J. Wong
2016-03-05 20:10   ` Christoph Hellwig
2016-03-05  0:38 ` [PATCH 09/12] xfs/122: support rmapxbt Darrick J. Wong
2016-03-05 20:12   ` Christoph Hellwig
2016-03-05  0:38 ` [PATCH 10/12] xfs: test per-ag allocation accounting during truncate-caused refcountbt expansion Darrick J. Wong
2016-03-05 20:23   ` Christoph Hellwig
2016-03-05  0:38 ` [PATCH 11/12] xfs: remove NOCOW_FL testing from test Darrick J. Wong
2016-03-05 20:10   ` Christoph Hellwig
2016-03-05  0:38 ` [PATCH 12/12] block: test fallocate for block devices Darrick J. Wong
2016-03-05 18:25   ` Christoph Hellwig
2016-03-07  8:26     ` Darrick J. Wong
2016-03-15  3:41     ` Dave Chinner
2016-03-15  8:34       ` Christoph Hellwig
2016-03-15 19:25   ` [PATCH v2 " Darrick J. Wong
2016-03-05 20:25 ` [PATCH 13/12] xfs/209: filter scratch dir properly Christoph Hellwig
2016-03-06 22:09   ` 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=20160305003737.28738.35234.stgit@birch.djwong.org \
    --to=darrick.wong@oracle.com \
    --cc=david@fromorbit.com \
    --cc=fstests@vger.kernel.org \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=linux-ext4@vger.kernel.org \
    --cc=xfs@oss.sgi.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: 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).