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=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham 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 EA3C3C433C1 for ; Sun, 28 Mar 2021 20:07:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BC99461945 for ; Sun, 28 Mar 2021 20:07:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230397AbhC1UGu (ORCPT ); Sun, 28 Mar 2021 16:06:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:49507 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230294AbhC1UGT (ORCPT ); Sun, 28 Mar 2021 16:06:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616961979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=bVJIXSweEpL4L0uR70s/TyX9ojfasmcZh9evzdaFpq0=; b=ThHuHB6ErbC8SHW9bfP5fK5dqowz1+DXBTL30ScIYBMQzjI0CPV+wnQoIkDuLFjljT9Gee 55MIIyi1rktpd4o0bjUNYkZ5+8f/d8oxg11A6rrmuI5CSxRPNVKc6NpAyHiklXxSH8LYub njV9RiHb1D18cyOGNFyAD6cSe+BVqK0= Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-360-E8_nNRyiOeSHuO84xWn0tg-1; Sun, 28 Mar 2021 16:06:16 -0400 X-MC-Unique: E8_nNRyiOeSHuO84xWn0tg-1 Received: by mail-pg1-f200.google.com with SMTP id l2so9079649pgi.5 for ; Sun, 28 Mar 2021 13:06:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=bVJIXSweEpL4L0uR70s/TyX9ojfasmcZh9evzdaFpq0=; b=iCLbhi+MjgMzw32hNOq3YxYnBdQLZt0rdjqj/Zvr3wMdEqkNxAG3gDwu+hBQV590Y0 VtyK+kMPCxtCuT1lncq6JcPE8S0zBvp0SdwSJK2zBtplLos4Y7l3athCsP6EezylSqrL bMDRgrDBpNHwzkpCx8HdNsFe6ZCsOcZ8/BYLm4VtML7nPDDDKFPb5ZtkiEQ/IAQ9zeq/ or5fz7u5Bl36T2D9giqyKSAMjCTGRfnkJf+oSrI7zkECXNiaTwb2O75TYLQz/A+0hsUG 6J+bQPwrrowIqKatj3d9afGGLTqEESh58TmKQnR8tPICiu3MAkEVZ6mABiDD9V723ZvI FYPA== X-Gm-Message-State: AOAM532fLNqRRM3WL/KmQ+G9RfEsRtltektsutpkgnFBkiijPHFUL0m8 ZNhJOQ2ILIphXkXMIaxjNcLqOeAXBahYqyEsLsjAaOkJTuGwoS0oEwGiSHnemxBHP+5x+Dzuo6S Y/8EPn54p8ytrNX9RCQ== X-Received: by 2002:a63:cd01:: with SMTP id i1mr21003447pgg.262.1616961975437; Sun, 28 Mar 2021 13:06:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+ZBd6uXpTiDQhP8SyCw5oyk3h/tgU6VjKl8/LiiYlRXoeM3NIUptF9jtgeFahFoOCenj+Xw== X-Received: by 2002:a63:cd01:: with SMTP id i1mr21003438pgg.262.1616961975178; Sun, 28 Mar 2021 13:06:15 -0700 (PDT) Received: from xiangao.remote.csb ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id f65sm7481585pgc.19.2021.03.28.13.06.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Mar 2021 13:06:14 -0700 (PDT) Date: Mon, 29 Mar 2021 04:06:03 +0800 From: Gao Xiang To: Eryu Guan 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: <20210328200603.GB3213575@xiangao.remote.csb> References: <20210315111926.837170-1-hsiangkao@redhat.com> <20210315111926.837170-3-hsiangkao@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org On Mon, Mar 29, 2021 at 12:32:39AM +0800, Eryu Guan wrote: > 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. Not quite sure if it's of some use (e.g. also need to update expected output when output changed), since I think just make sure the shrinked size is as expected and xfs_repair won't argue anything on the new size, that would be enough. > > > + > > + _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? I didn't notice this, will update. > > > + _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. er... my idea is that I don't want to continue the test case if any fails... if dump the expected size to output, I need to fix blocksize as well, not sure if it's necessary. > > > +} > > + > > +# real QA test starts here > > +_supported_fs xfs > > Still missing _require_scratch No, _require_xfs_shrink will include that, just as _require_xfs_scratch_rmapbt. > > > +_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 just because agcount = 1 is forbidden on purpose, and I need to make sure shrinking to 2 AG is not possible yet. So agcount = 3 is the minimum number. It's just a functionality test, so agcount = 3 also makes the result determinatively. > > > +. $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. The same as above. I could try to fix blocksize if the opinion is strong. > > > + > > +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? not sure if it needs, since shrinkfs reuses growfs ioctl. Thanks, Gao Xiang > > Thanks, > Eryu >