public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
From: Chandan Rajendra <chandan@linux.vnet.ibm.com>
To: fstests@vger.kernel.org
Cc: Chandan Rajendra <chandan@linux.vnet.ibm.com>,
	guaneryu@gmail.com, darrick.wong@oracle.com, zlang@redhat.com,
	linux-xfs@vger.kernel.org
Subject: [PATCH V4 06/20] Fix xfs/139 to work with 64k block size
Date: Wed, 19 Sep 2018 17:30:39 +0530	[thread overview]
Message-ID: <20180919120053.7339-7-chandan@linux.vnet.ibm.com> (raw)
In-Reply-To: <20180919120053.7339-1-chandan@linux.vnet.ibm.com>

For 64k block size, the agsize provided in the test causes mkfs.xfs to
fail due to insufficient log space. Hence this commit computes agsize
based on block size of the filesystem.

Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
---
 tests/xfs/139     | 15 +++++++++------
 tests/xfs/139.out |  8 ++++++--
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/tests/xfs/139 b/tests/xfs/139
index 2a26635..c074273 100755
--- a/tests/xfs/139
+++ b/tests/xfs/139
@@ -34,17 +34,20 @@ _require_cp_reflink
 
 rm -f $seqres.full
 
+_scratch_mkfs >/dev/null 2>&1
+_scratch_mount
+blksz=$(_get_file_block_size $SCRATCH_MNT)
+_scratch_unmount
+
 echo "Format and mount"
-_scratch_mkfs -d agsize=$((32 * 1048576)) > $seqres.full 2>&1
+_scratch_mkfs -d agsize=$((8192 * $blksz)) > $seqres.full 2>&1
 _scratch_mount >> $seqres.full 2>&1
 
 testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
-blksz="$(_get_block_size $testdir)"
 
 echo "Create the original files"
-sz=$((48 * 1048576))
-nr=$((sz / blksz))
+sz=$((12288 * $blksz))
 _pwrite_byte 0x61 0 $sz $testdir/file1 >> $seqres.full
 _cp_reflink $testdir/file1 $testdir/file2 >> $seqres.full
 _scratch_cycle_mount
@@ -54,8 +57,8 @@ _pwrite_byte 0x62 0 $sz $testdir/file1 >> $seqres.full
 _scratch_cycle_mount
 
 echo "Compare files"
-md5sum $testdir/file1 | _filter_scratch
-md5sum $testdir/file2 | _filter_scratch
+od -t x1 $testdir/file1 | _filter_od
+od -t x1 $testdir/file2 | _filter_od
 #filefrag -v $testdir/file1 $testdir/file2
 
 # success, all done
diff --git a/tests/xfs/139.out b/tests/xfs/139.out
index dc6a31e..72909bc 100644
--- a/tests/xfs/139.out
+++ b/tests/xfs/139.out
@@ -3,5 +3,9 @@ Format and mount
 Create the original files
 CoW every other block
 Compare files
-673c759fb131ccf3336c4f8c549a497e  SCRATCH_MNT/test-139/file1
-dc802351f6717547cbf4c951b294f952  SCRATCH_MNT/test-139/file2
+0 62 62 62 62 62 62 62 62 62 62 62 62 62 62 62 62
+*
+30000
+0 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61
+*
+30000
-- 
2.9.5

  parent reply	other threads:[~2018-09-19 17:36 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-19 12:00 [PATCH V4 00/20] Fix tests to work on non-4k block sized fs instances Chandan Rajendra
2018-09-19 12:00 ` [PATCH V4 01/20] Fix xfs/009 to work with 64k block size Chandan Rajendra
2018-09-19 12:00 ` [PATCH V4 02/20] xfs/050: Fix "Push past soft inode limit" case Chandan Rajendra
2018-09-19 12:00 ` [PATCH V4 03/20] Fix xfs/050 to work with 64k block size Chandan Rajendra
2018-09-19 12:00 ` [PATCH V4 04/20] Fix xfs/074 " Chandan Rajendra
2018-09-19 12:00 ` [PATCH V4 05/20] Fix xfs/127 " Chandan Rajendra
2018-09-19 12:00 ` Chandan Rajendra [this message]
2018-09-19 12:00 ` [PATCH V4 07/20] Fix xfs/140 " Chandan Rajendra
2018-09-19 12:00 ` [PATCH V4 08/20] Fix xfs/190 " Chandan Rajendra
2018-09-19 12:00 ` [PATCH V4 09/20] xfs/299: Fix "Push past soft inode limit" case Chandan Rajendra
2018-09-19 12:00 ` [PATCH V4 10/20] Fix xfs/299 to work with 64k block size Chandan Rajendra
2018-09-19 12:00 ` [PATCH V4 11/20] xfs/325: Inject free_extent error after CoW operation Chandan Rajendra
2018-09-19 12:00 ` [PATCH V4 12/20] Fix generic/102 to work with 64k block size Chandan Rajendra
2018-09-19 12:00 ` [PATCH V4 13/20] Fix generic/172 " Chandan Rajendra
2018-09-19 12:00 ` [PATCH V4 14/20] Filter fiemap output by FS " Chandan Rajendra
2018-09-19 12:00 ` [PATCH V4 15/20] Fix generic/177 to work with 64k " Chandan Rajendra
2018-09-19 12:00 ` [PATCH V4 16/20] Fix generic/230 " Chandan Rajendra
2018-09-19 12:00 ` [PATCH V4 17/20] Fix generic/235 " Chandan Rajendra
2018-09-19 12:00 ` [PATCH V4 18/20] Fix generic/459 " Chandan Rajendra
2018-09-19 12:00 ` [PATCH V4 19/20] Fix generic/018 " Chandan Rajendra
2018-09-19 12:00 ` [PATCH V4 20/20] Fix generic/108 " Chandan Rajendra
2018-09-20  9:33 ` [PATCH V4 00/20] Fix tests to work on non-4k block sized fs instances Zorro Lang
2018-09-22 16:24   ` Eryu Guan
2018-09-24 10:04     ` Chandan Rajendra
2018-09-24 14:19       ` Eryu Guan

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=20180919120053.7339-7-chandan@linux.vnet.ibm.com \
    --to=chandan@linux.vnet.ibm.com \
    --cc=darrick.wong@oracle.com \
    --cc=fstests@vger.kernel.org \
    --cc=guaneryu@gmail.com \
    --cc=linux-xfs@vger.kernel.org \
    --cc=zlang@redhat.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