From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CD3DC433DB for ; Sun, 28 Mar 2021 16:33:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0187661948 for ; Sun, 28 Mar 2021 16:33:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231154AbhC1Qc7 (ORCPT ); Sun, 28 Mar 2021 12:32:59 -0400 Received: from out20-63.mail.aliyun.com ([115.124.20.63]:32787 "EHLO out20-63.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229593AbhC1Qcp (ORCPT ); Sun, 28 Mar 2021 12:32:45 -0400 X-Alimail-AntiSpam: AC=CONTINUE;BC=0.07436936|-1;CH=green;DM=|CONTINUE|false|;DS=CONTINUE|ham_system_inform|0.0634442-0.00201029-0.934546;FP=0|0|0|0|0|-1|-1|-1;HT=ay29a033018047205;MF=guan@eryu.me;NM=1;PH=DS;RN=5;RT=5;SR=0;TI=SMTPD_---.Jral0rL_1616949159; Received: from localhost(mailfrom:guan@eryu.me fp:SMTPD_---.Jral0rL_1616949159) by smtp.aliyun-inc.com(10.147.41.158); Mon, 29 Mar 2021 00:32:40 +0800 Date: Mon, 29 Mar 2021 00:32:39 +0800 From: Eryu Guan To: Gao Xiang Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org, "Darrick J. Wong" , Zorro Lang Subject: Re: [RFC PATCH v3 2/3] xfs: basic functionality test for shrinking free space in the last AG Message-ID: References: <20210315111926.837170-1-hsiangkao@redhat.com> <20210315111926.837170-3-hsiangkao@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210315111926.837170-3-hsiangkao@redhat.com> Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org On Mon, Mar 15, 2021 at 07:19:25PM +0800, Gao Xiang wrote: > Add basic test to make sure the functionality works as expected. > > Signed-off-by: Gao Xiang > --- > tests/xfs/990 | 70 +++++++++++++++++++++++++++++++++++++++++++++++ > tests/xfs/990.out | 12 ++++++++ > tests/xfs/group | 1 + > 3 files changed, 83 insertions(+) > create mode 100755 tests/xfs/990 > create mode 100644 tests/xfs/990.out > > diff --git a/tests/xfs/990 b/tests/xfs/990 > new file mode 100755 > index 00000000..3c79186e > --- /dev/null > +++ b/tests/xfs/990 > @@ -0,0 +1,70 @@ > +#! /bin/bash > +# SPDX-License-Identifier: GPL-2.0 > +# Copyright (c) 2021 Red Hat, Inc. All Rights Reserved. > +# > +# FS QA Test 990 > +# > +# XFS shrinkfs basic functionality test > +# > +# This test attempts to shrink with a small size (512K), half AG size and > +# an out-of-bound size (agsize + 1) to observe if it works as expected. > +# > +seq=`basename $0` > +seqres=$RESULT_DIR/$seq > +echo "QA output created by $seq" > + > +here=`pwd` > +tmp=/tmp/$$ > +status=1 # failure is the default! > +trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 > + > +# get standard environment, filters and checks > +. ./common/rc > +. ./common/filter > + > +test_shrink() > +{ > + $XFS_GROWFS_PROG -D"$1" $SCRATCH_MNT >> $seqres.full 2>&1 > + ret=$? I'm not sure what's the output of xfs_growfs when shrinking filesystem, if it's easy to do filter, but it'd be good if we could just dump the output and let .out file match & check the test result. > + > + _scratch_unmount > + _repair_scratch_fs >> $seqres.full _repair_scratch_fs will fix corruption if there's any, and always return 0 if completes without problems. Is _check_scratch_fs() what you want? > + _scratch_mount >> $seqres.full > + > + $XFS_INFO_PROG $SCRATCH_MNT 2>&1 | _filter_mkfs 2>$tmp.growfs >/dev/null > + . $tmp.growfs > + [ $ret -eq 0 -a $1 -eq $dblocks ] Just dump the expected size after shrink if possible. > +} > + > +# real QA test starts here > +_supported_fs xfs Still missing _require_scratch > +_require_xfs_shrink > + > +rm -f $seqres.full > +echo "Format and mount" > +_scratch_mkfs -dsize="$((512 * 1024 * 1024))" -dagcount=3 2>&1 | \ > + tee -a $seqres.full | _filter_mkfs 2>$tmp.mkfs Better to explain why mkfs with agcount=3 > +. $tmp.mkfs > +t_dblocks=$dblocks > +_scratch_mount >> $seqres.full > + > +echo "Shrink fs (small size)" > +test_shrink $((t_dblocks-512*1024/dbsize)) || \ > + _fail "Shrink fs (small size) failure" If it's possible to turn test_shrink to .out file matching way, _fail is not needed and below. > + > +echo "Shrink fs (half AG)" > +test_shrink $((t_dblocks-agsize/2)) || \ > + _fail "Shrink fs (half AG) failure" > + > +echo "Shrink fs (out-of-bound)" > +test_shrink $((t_dblocks-agsize-1)) && \ > + _fail "Shrink fs (out-of-bound) failure" > +[ $dblocks -ne $((t_dblocks-agsize/2)) ] && \ > + _fail "dblocks changed after shrinking failure" > + > +$XFS_INFO_PROG $SCRATCH_MNT >> $seqres.full > +echo "*** done" > + > +# success, all done > +status=0 > +exit > diff --git a/tests/xfs/990.out b/tests/xfs/990.out > new file mode 100644 > index 00000000..812f89ef > --- /dev/null > +++ b/tests/xfs/990.out > @@ -0,0 +1,12 @@ > +QA output created by 990 > +Format and mount > +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 > +Shrink fs (small size) > +Shrink fs (half AG) > +Shrink fs (out-of-bound) > +*** done > diff --git a/tests/xfs/group b/tests/xfs/group > index e861cec9..a7981b67 100644 > --- a/tests/xfs/group > +++ b/tests/xfs/group > @@ -525,3 +525,4 @@ > 525 auto quick mkfs > 526 auto quick mkfs > 527 auto quick quota > +990 auto quick growfs Maybe it's time to add a new 'shrinkfs' group? Thanks, Eryu