From patchwork Tue Feb 24 22:54:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Chinner X-Patchwork-Id: 5875751 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8623DBF440 for ; Tue, 24 Feb 2015 22:59:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 265C420225 for ; Tue, 24 Feb 2015 22:59:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E9FE92022D for ; Tue, 24 Feb 2015 22:59:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752470AbbBXW7w (ORCPT ); Tue, 24 Feb 2015 17:59:52 -0500 Received: from ipmail04.adl6.internode.on.net ([150.101.137.141]:20169 "EHLO ipmail04.adl6.internode.on.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752587AbbBXW7v (ORCPT ); Tue, 24 Feb 2015 17:59:51 -0500 X-Greylist: delayed 303 seconds by postgrey-1.27 at vger.kernel.org; Tue, 24 Feb 2015 17:59:47 EST X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2D0CABjAO1UPDkjLHlbgwaBLIY2qg4BAQEBAgaMYo0SRAEBAQEBAQUBAQEBODuEEAEFVjMIGDE5AwcUGYgu1T+GB44sBYVkpneBZwELgjEqMYJDAQEB Received: from ppp121-44-35-57.lns20.syd4.internode.on.net (HELO dastard) ([121.44.35.57]) by ipmail04.adl6.internode.on.net with ESMTP; 25 Feb 2015 09:24:42 +1030 Received: from disappointment.disaster.area ([192.168.1.110] helo=disappointment) by dastard with esmtp (Exim 4.80) (envelope-from ) id 1YQONF-0004vx-Ul for fstests@vger.kernel.org; Wed, 25 Feb 2015 09:54:41 +1100 Received: from dave by disappointment with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1YQONF-0002fz-Te for fstests@vger.kernel.org; Wed, 25 Feb 2015 09:54:41 +1100 From: Dave Chinner To: fstests@vger.kernel.org Subject: [PATCH 1/4] xfs/104: log size too small for 4k sector drives Date: Wed, 25 Feb 2015 09:54:36 +1100 Message-Id: <1424818479-10083-2-git-send-email-david@fromorbit.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1424818479-10083-1-git-send-email-david@fromorbit.com> References: <1424818479-10083-1-git-send-email-david@fromorbit.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Dave Chinner xfs/104, xfs/119, xfs/291 and xfs/297 have small fixed log sizes. A recent change to the kernel ramdisk changed it's physical sector size from 512B to 4kB, and this results in mkfs calculating a log size larger than the fixed test size and hence the tests fail. Change the log size to a larger size that works with 4k sectors, and also increase the size of the filesystem being created so that the amount of data space in the filesystem does not change and hence does not perturb the rest of the test. Signed-off-by: Dave Chinner --- tests/xfs/104 | 8 ++++---- tests/xfs/104.out | 46 +++++++++++++++++++++++----------------------- tests/xfs/119 | 2 +- tests/xfs/291 | 2 +- tests/xfs/297 | 2 +- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/tests/xfs/104 b/tests/xfs/104 index 69fcc69..ca2ae21 100755 --- a/tests/xfs/104 +++ b/tests/xfs/104 @@ -81,10 +81,10 @@ modsize=`expr 4 \* $incsize` # pause after this many increments [ `expr $endsize / $dbsize` -lt $dblocks ] || _notrun "Scratch device too small" nags=4 -size=`expr 120 \* 1048576` # 120 megabytes initially +size=`expr 125 \* 1048576` # 120 megabytes initially sizeb=`expr $size / $dbsize` # in data blocks echo "*** creating scratch filesystem" -_create_scratch -lsize=5m -dsize=${size} -dagcount=${nags} +_create_scratch -lsize=10m -dsize=${size} -dagcount=${nags} fillsize=`expr 110 \* 1048576` # 110 megabytes of filling echo "*** using some initial space on scratch filesystem" @@ -95,13 +95,13 @@ _fill_scratch $fillsize # Kick off more stress threads on each iteration, grow; repeat. # while [ $size -le $endsize ]; do - echo "*** stressing a ${size} byte filesystem" + echo "*** stressing filesystem" echo "*** stressing a ${sizeb} block filesystem" >> $seqres.full _stress_scratch sleep 1 size=`expr $size + $incsize` sizeb=`expr $size / $dbsize` # in data blocks - echo "*** growing to a ${size} byte filesystem" + echo "*** growing filesystem" echo "*** growing to a ${sizeb} block filesystem" >> $seqres.full xfs_growfs -D ${sizeb} $SCRATCH_MNT \ | tee -a $seqres.full | _filter_mkfs 2>$tmp.growfs diff --git a/tests/xfs/104.out b/tests/xfs/104.out index f237e5e..de6c7f2 100644 --- a/tests/xfs/104.out +++ b/tests/xfs/104.out @@ -15,8 +15,8 @@ log =LDEV bsize=XXX blocks=XXX realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX *** mount *** using some initial space on scratch filesystem -*** stressing a 125829120 byte filesystem -*** growing to a 169869312 byte filesystem +*** stressing filesystem +*** growing filesystem meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks data = bsize=XXX blocks=XXX, imaxpct=PCT = sunit=XXX swidth=XXX, unwritten=X @@ -25,8 +25,8 @@ log =LDEV bsize=XXX blocks=XXX realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX AGCOUNT=4 -*** stressing a 169869312 byte filesystem -*** growing to a 213909504 byte filesystem +*** stressing filesystem +*** growing filesystem meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks data = bsize=XXX blocks=XXX, imaxpct=PCT = sunit=XXX swidth=XXX, unwritten=X @@ -35,8 +35,8 @@ log =LDEV bsize=XXX blocks=XXX realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX AGCOUNT=6 -*** stressing a 213909504 byte filesystem -*** growing to a 257949696 byte filesystem +*** stressing filesystem +*** growing filesystem meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks data = bsize=XXX blocks=XXX, imaxpct=PCT = sunit=XXX swidth=XXX, unwritten=X @@ -45,8 +45,8 @@ log =LDEV bsize=XXX blocks=XXX realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX AGCOUNT=7 -*** stressing a 257949696 byte filesystem -*** growing to a 301989888 byte filesystem +*** stressing filesystem +*** growing filesystem meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks data = bsize=XXX blocks=XXX, imaxpct=PCT = sunit=XXX swidth=XXX, unwritten=X @@ -55,8 +55,8 @@ log =LDEV bsize=XXX blocks=XXX realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX AGCOUNT=9 -*** stressing a 301989888 byte filesystem -*** growing to a 346030080 byte filesystem +*** stressing filesystem +*** growing filesystem meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks data = bsize=XXX blocks=XXX, imaxpct=PCT = sunit=XXX swidth=XXX, unwritten=X @@ -65,8 +65,8 @@ log =LDEV bsize=XXX blocks=XXX realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX AGCOUNT=10 -*** stressing a 346030080 byte filesystem -*** growing to a 390070272 byte filesystem +*** stressing filesystem +*** growing filesystem meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks data = bsize=XXX blocks=XXX, imaxpct=PCT = sunit=XXX swidth=XXX, unwritten=X @@ -75,8 +75,8 @@ log =LDEV bsize=XXX blocks=XXX realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX AGCOUNT=11 -*** stressing a 390070272 byte filesystem -*** growing to a 434110464 byte filesystem +*** stressing filesystem +*** growing filesystem meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks data = bsize=XXX blocks=XXX, imaxpct=PCT = sunit=XXX swidth=XXX, unwritten=X @@ -85,8 +85,8 @@ log =LDEV bsize=XXX blocks=XXX realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX AGCOUNT=13 -*** stressing a 434110464 byte filesystem -*** growing to a 478150656 byte filesystem +*** stressing filesystem +*** growing filesystem meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks data = bsize=XXX blocks=XXX, imaxpct=PCT = sunit=XXX swidth=XXX, unwritten=X @@ -95,18 +95,18 @@ log =LDEV bsize=XXX blocks=XXX realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX AGCOUNT=14 -*** stressing a 478150656 byte filesystem -*** growing to a 522190848 byte filesystem +*** stressing filesystem +*** growing filesystem meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks data = bsize=XXX blocks=XXX, imaxpct=PCT = sunit=XXX swidth=XXX, unwritten=X naming =VERN bsize=XXX log =LDEV bsize=XXX blocks=XXX realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX -AGCOUNT=16 +AGCOUNT=15 -*** stressing a 522190848 byte filesystem -*** growing to a 566231040 byte filesystem +*** stressing filesystem +*** growing filesystem meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks data = bsize=XXX blocks=XXX, imaxpct=PCT = sunit=XXX swidth=XXX, unwritten=X @@ -115,8 +115,8 @@ log =LDEV bsize=XXX blocks=XXX realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX AGCOUNT=17 -*** stressing a 566231040 byte filesystem -*** growing to a 610271232 byte filesystem +*** stressing filesystem +*** growing filesystem meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks data = bsize=XXX blocks=XXX, imaxpct=PCT = sunit=XXX swidth=XXX, unwritten=X diff --git a/tests/xfs/119 b/tests/xfs/119 index c7c46d9..490495b 100755 --- a/tests/xfs/119 +++ b/tests/xfs/119 @@ -54,7 +54,7 @@ _require_scratch # this may hang sync -export MKFS_OPTIONS="-l version=2,size=1200b,su=64k" +export MKFS_OPTIONS="-l version=2,size=2500b,su=64k" export MOUNT_OPTIONS="-o logbsize=64k" _scratch_mkfs_xfs >/dev/null diff --git a/tests/xfs/291 b/tests/xfs/291 index fbf9c51..c226e65 100755 --- a/tests/xfs/291 +++ b/tests/xfs/291 @@ -46,7 +46,7 @@ _supported_os IRIX Linux # real QA test starts here rm -f $seqres.full _require_scratch -_scratch_mkfs_xfs -n size=16k -l size=5m -d size=128m >> $seqres.full 2>&1 +_scratch_mkfs_xfs -n size=16k -l size=10m -d size=133m >> $seqres.full 2>&1 _scratch_mount # First we cause very badly fragmented freespace, then diff --git a/tests/xfs/297 b/tests/xfs/297 index 1cdbbb9..25b597e 100755 --- a/tests/xfs/297 +++ b/tests/xfs/297 @@ -50,7 +50,7 @@ _require_scratch _require_freeze rm -f $seqres.full -_scratch_mkfs_xfs -d agcount=16,su=256k,sw=12 -l su=256k,size=2560b >/dev/null 2>&1 +_scratch_mkfs_xfs -d agcount=16,su=256k,sw=12 -l su=256k,size=5120b >/dev/null 2>&1 _scratch_mount >/dev/null 2>&1 STRESS_DIR="$SCRATCH_MNT/testdir"