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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E306C433EF for ; Thu, 12 May 2022 19:06:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353630AbiELTGw (ORCPT ); Thu, 12 May 2022 15:06:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357872AbiELTGv (ORCPT ); Thu, 12 May 2022 15:06:51 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A82D6B7C8 for ; Thu, 12 May 2022 12:06:50 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id DED2DB8290E for ; Thu, 12 May 2022 19:06:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E0ADC34116; Thu, 12 May 2022 19:06:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652382407; bh=nYbEePXaOk6v9iBV5a2PP5Zg9QOKfGinAFQfEqGu7ag=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=QZ0DOcu4pFpKsZdGOtw6xbeoAngLi3MmPpD78tVIgga6tXYgbZpGry6VCQ1ogN29k ll9JMJpjOIXAYlsxK3G9tZxmXtzrmufzyt9K8V86msK5ieyF1j+X+1go37NMws9my3 1hOw3O4aEzcGtP+o7uezrok3Ij4atq0pQI1LGU1Ma3NRi/Lji//jDEFrdAbchvKZM+ wrjsvy/rvMZPvHyrapu+pBhfmfTkCoKNUgxTITSbT7Wav1zYGO1SEafSP+EupiRCAq +QVIGQudHoC4xZLWVXHbHfbHptmPb0mPy9j1RzTHCjjb7mx0rDsGzgPeY+FFeQdmhz TZ/yONWokgWpw== Date: Thu, 12 May 2022 12:06:47 -0700 From: "Darrick J. Wong" To: Zorro Lang Cc: fstests@vger.kernel.org Subject: Re: [PATCH v3 1/2] generic: soft quota limits testing within grace time Message-ID: <20220512190647.GC27174@magnolia> References: <20220512182203.2839593-1-zlang@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220512182203.2839593-1-zlang@kernel.org> Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org On Fri, May 13, 2022 at 02:22:02AM +0800, Zorro Lang wrote: > After soft limits are exceeded, within the grace time, fs quota > should allow more space allocation before exceeding hard limits, > even if allocating many small files. > > This case can cover bc37e4fb5cac (xfs: revert "xfs: actually bump > warning counts when we send warnings"). And will help to expose > later behavior changes on this side. > > Signed-off-by: Zorro Lang > --- > > According to the review points of: > https://lore.kernel.org/fstests/20220511163806.uc4z7td2remhdru3@zlang-mailbox/T/#m23940b47261165a0442c7ae1eb4d96a1489a2935 > V3 did below changes: > 1) fix some comments description > 2) add a few hard limit test > 3) And bring in [PATCH 2/2], to help g/603 to use the common functions of this > patch. > > Thanks, > Zorro > > common/quota | 48 +++++++++++++++++++++ > tests/generic/999 | 99 +++++++++++++++++++++++++++++++++++++++++++ > tests/generic/999.out | 2 + > 3 files changed, 149 insertions(+) > create mode 100755 tests/generic/999 > create mode 100644 tests/generic/999.out > > diff --git a/common/quota b/common/quota > index 7fa1a61a..67698f74 100644 > --- a/common/quota > +++ b/common/quota > @@ -351,5 +351,53 @@ _qsetup() > echo "Using type=$type id=$id" >> $seqres.full > } > > +# Help to create project quota on directory, works for xfs and other fs. > +# Usage: _create_project_quota [name] > +# Although the [name] is optional, better to specify it if need a fixed name. > +_create_project_quota() > +{ > + local prjdir=$1 > + local id=$2 > + local name=$3 > + > + if [ -z "$name" ];then > + name=`echo $projdir | tr \/ \_` > + fi > + > + rm -rf $prjdir > + mkdir $prjdir > + chmod ugo+rwx $prjdir > + > + if [ -f /etc/projects -a ! -f $tmp.projects.bk ];then > + cat /etc/projects > $tmp.projects.bk > + echo >/etc/projects > + fi > + if [ -f /etc/projid -a ! -f $tmp.projid.bk ];then > + cat /etc/projid > $tmp.projid.bk > + echo >/etc/projid > + fi > + > + cat >>/etc/projects < +$id:$prjdir > +EOF > + cat >>/etc/projid < +$name:$id > +EOF > + $XFS_IO_PROG -r -c "chproj $id" -c "chattr +P" $prjdir > +} > + > +# If you've called _create_project_quota, then use this function in _cleanup > +_restore_project_quota() > +{ > + if [ -f $tmp.projects.bk ];then > + cat $tmp.projects.bk > /etc/projects && \ > + rm -f $tmp.projects.bk > + fi > + if [ -f $tmp.projid.bk ];then > + cat $tmp.projid.bk > /etc/projid && \ > + rm -f $tmp.projid.bk > + fi > +} > + > # make sure this script returns success > /bin/true > diff --git a/tests/generic/999 b/tests/generic/999 > new file mode 100755 > index 00000000..76d68df5 > --- /dev/null > +++ b/tests/generic/999 > @@ -0,0 +1,99 @@ > +#! /bin/bash > +# SPDX-License-Identifier: GPL-2.0 > +# Copyright (c) 2022 Red Hat Inc. All Rights Reserved. > +# > +# FS QA Test No. 999 > +# > +# Make sure filesystem quota works well, after soft limits are exceeded. The > +# fs quota should allow more space allocation before exceeding hard limits > +# and with in grace time. > +# > +# But different with other similar testing, this case tries to write many small > +# files, to cover bc37e4fb5cac (xfs: revert "xfs: actually bump warning counts > +# when we send warnings"). If there's a behavior change some day, this case > +# might help to detect that too. > +# > +. ./common/preamble > +_begin_fstest auto quota > + > +# Override the default cleanup function. > +_cleanup() > +{ > + _restore_project_quota > + cd / > + rm -r -f $tmp.* > +} > + > +# Import common functions. > +. ./common/quota > + > +# real QA test starts here > +_supported_fs generic > +_require_scratch > +_require_quota > +_require_user > +_require_group > + > +# Make sure the kernel supports project quota > +_scratch_mkfs >$seqres.full 2>&1 > +_scratch_enable_pquota > +_qmount_option "prjquota" > +_qmount > +_require_prjquota $SCRATCH_DEV > + > +exercise() > +{ > + local type=$1 > + local file=$SCRATCH_MNT/testfile > + > + echo "= Test type=$type quota =" >>$seqres.full > + _scratch_unmount > + _scratch_mkfs >>$seqres.full 2>&1 > + if [ "$1" = "P" ];then > + _scratch_enable_pquota > + fi > + _qmount > + if [ "$1" = "P" ];then > + _create_project_quota $SCRATCH_MNT/t 100 $qa_user > + file=$SCRATCH_MNT/t/testfile > + fi > + > + setquota -${type} $qa_user 1M 200M 0 0 $SCRATCH_MNT > + setquota -${type} -t 86400 86400 $SCRATCH_MNT > + repquota -v -${type} $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1 > + # Exceed the soft quota limit a bit at first > + su $qa_user -c "$XFS_IO_PROG -f -t -c 'pwrite 0 2m' -c fsync ${file}.0" >>$seqres.full 2>&1 > + # Write more data more times under soft quota limit exhausted condition, > + # but not reach hard limit. To make sure each write won't trigger EDQUOT. > + for ((i=1; i<=100; i++));do > + su "$qa_user" -c "$XFS_IO_PROG -f -c 'pwrite 0 1m' -c fsync ${file}.$i" >>$seqres.full 2>&1 Hmm -- if pwrite or fsync hit an error, shouldn't we let that end up in 999.out so that the golden output diff fails? > + if [ $? -ne 0 ];then > + echo "Unexpected error (type=$type)!" > + break > + fi > + done > + repquota -v -${type} $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1 > + > + # As we've tested soft limit, now exceed the hard limit and give it a > + # test in passing. > + su $qa_user -c "$XFS_IO_PROG -f -t -c 'pwrite 0 100m' -c fsync ${file}.hard.0" >>$seqres.full 2>&1 > + for ((i=1; i<=10; i++));do > + su "$qa_user" -c "$XFS_IO_PROG -f -c 'pwrite 0 1m' -c fsync ${file}.hard.$i" >>$seqres.full 2>&1 Don't we want to encode the actual error in the golden output? --D > + if [ $? -eq 0 ];then > + echo "Unexpected success (type=$type)!" > + break > + fi > + done > +} > + > +_qmount_option "usrquota" > +exercise u > +_qmount_option "grpquota" > +exercise g > +_qmount_option "prjquota" > +exercise P > + > +echo "Silence is golden" > +# success, all done > +status=0 > +exit > diff --git a/tests/generic/999.out b/tests/generic/999.out > new file mode 100644 > index 00000000..3b276ca8 > --- /dev/null > +++ b/tests/generic/999.out > @@ -0,0 +1,2 @@ > +QA output created by 999 > +Silence is golden > -- > 2.31.1 >