On 09 Mar 2021 at 10:10, Darrick J. Wong wrote: > From: Darrick J. Wong <djwong@xxxxxxxxxx> > > Make sure that quota softlimits work, which is to say that one can > exceed the softlimit up to warnlimit times before it starts enforcing > that. > > Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> > --- > tests/xfs/915 | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > tests/xfs/915.out | 151 +++++++++++++++++++++++++++++++++++++++++++++++++ > tests/xfs/group | 1 > 3 files changed, 314 insertions(+) > create mode 100755 tests/xfs/915 > create mode 100644 tests/xfs/915.out > > > diff --git a/tests/xfs/915 b/tests/xfs/915 > new file mode 100755 > index 00000000..a2cdbbb7 > --- /dev/null > +++ b/tests/xfs/915 > @@ -0,0 +1,162 @@ > +#! /bin/bash > +# SPDX-License-Identifier: GPL-2.0-or-later > +# Copyright (c) 2021 Oracle. All Rights Reserved. > +# > +# FS QA Test No. 915 > +# > +# Check that quota softlimit warnings work the way they should. This means > +# that we can disobey the softlimit up to warnlimit times before it turns into > +# hard(er) enforcement. This is a functional test for quota warnings, but > +# since the functionality has been broken for decades, this is also a > +# regression test for commit 4b8628d57b72 ("xfs: actually bump warning counts > +# when we send warnings"). > + > +seq=`basename $0` > +seqres=$RESULT_DIR/$seq > +echo "QA output created by $seq" > + > +here=`pwd` > +tmp=/tmp/$$ > +status=1 # failure is the default! > +trap "_cleanup; exit \$status" 0 1 2 3 15 > + > +_cleanup() > +{ > + cd / > + rm -f $tmp.* > +} > + > +# get standard environment, filters and checks > +. ./common/rc > +. ./common/filter > +. ./common/quota > + > +# real QA test starts here > +_supported_fs xfs > +_require_xfs_quota > +_require_scratch > + > +rm -f $seqres.full > + > +qsetup() > +{ > + opt=$1 > + enforce=0 > + if [ $opt = "u" -o $opt = "uno" ]; then > + type=u > + eval `_choose_uid` > + elif [ $opt = "g" -o $opt = "gno" ]; then > + type=g > + eval `_choose_gid` > + elif [ $opt = "p" -o $opt = "pno" ]; then > + type=p > + eval `_choose_prid` > + fi > + [ $opt = "u" -o $opt = "g" -o $opt = "p" ] && enforce=1 > + > + echo "Using type=$type id=$id" >> $seqres.full > +} > + > +exercise() { > + _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs > + cat $tmp.mkfs >>$seqres.full > + > + # keep the blocksize and data size for dd later > + . $tmp.mkfs > + > + _qmount > + > + qsetup $1 > + > + echo "Using type=$type id=$id" >>$seqres.full > + > + echo > + echo "*** report initial settings" | tee -a $seqres.full > + $XFS_QUOTA_PROG -x \ > + -c "limit -$type isoft=3 ihard=500000 $id" \ > + -c "warn -$type -i -d 13" \ > + $SCRATCH_DEV > + $XFS_QUOTA_PROG -x \ > + -c "state -$type" >> $seqres.full > + $XFS_QUOTA_PROG -x \ > + -c "repquota -birnN -$type" $SCRATCH_DEV | > + _filter_quota_report | LC_COLLATE=POSIX sort -ru > + > + echo > + echo "*** push past the soft inode limit" | tee -a $seqres.full > + _file_as_id $SCRATCH_MNT/softok1 $id $type $bsize 0 > + _file_as_id $SCRATCH_MNT/softok2 $id $type $bsize 0 > + _file_as_id $SCRATCH_MNT/softok3 $id $type $bsize 0 > + _file_as_id $SCRATCH_MNT/softwarn1 $id $type $bsize 0 > + $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \ > + -c "repquota -birnN -$type" $SCRATCH_DEV | > + _filter_quota_report | LC_COLLATE=POSIX sort -ru > + > + echo > + echo "*** push further past the soft inode limit" | tee -a $seqres.full > + for warn_nr in $(seq 2 5); do > + _file_as_id $SCRATCH_MNT/softwarn$warn_nr $id $type $bsize 0 > + done > + $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \ > + -c "repquota -birnN -$type" $SCRATCH_DEV | > + _filter_quota_report | LC_COLLATE=POSIX sort -ru > + > + echo > + echo "*** push past the soft inode warning limit" | tee -a $seqres.full > + for warn_nr in $(seq 6 15); do > + _file_as_id $SCRATCH_MNT/softwarn$warn_nr $id $type $bsize 0 > + done > + $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \ > + -c "repquota -birnN -$type" $SCRATCH_DEV | > + _filter_quota_report | LC_COLLATE=POSIX sort -ru > + > + echo > + echo "*** unmount" > + _scratch_unmount > +} > + > +_scratch_mkfs > $seqres.full > +_scratch_mount >> $seqres.full > + > +chmod a+rwx $SCRATCH_MNT $seqres.full # arbitrary users will write here > +bsize=$(_get_file_block_size $SCRATCH_MNT) > +_scratch_unmount > + > +cat >$tmp.projects <<EOF > +1:$SCRATCH_MNT > +EOF > + > +cat >$tmp.projid <<EOF > +root:0 > +scratch:1 > +EOF > + > +projid_file="$tmp.projid" > + > +echo "*** user" > +_qmount_option "uquota" > +exercise u > + > +echo "*** group" > +_qmount_option "gquota" > +exercise g > + > +echo "*** uqnoenforce" > +_qmount_option "uqnoenforce" > +exercise uno > + > +echo "*** gqnoenforce" > +_qmount_option "gqnoenforce" > +exercise gno > + > +echo "*** pquota" > +_qmount_option "pquota" > +exercise p > + > +echo "*** pqnoenforce" > +_qmount_option "pqnoenforce" > +exercise pno > + > +# success, all done > +status=0 > +exit > diff --git a/tests/xfs/915.out b/tests/xfs/915.out > new file mode 100644 > index 00000000..c3bb855e > --- /dev/null > +++ b/tests/xfs/915.out > @@ -0,0 +1,151 @@ > +QA output created by 915 > +*** user > +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 > + > +*** report initial settings > +[ROOT] 0 0 0 00 [--------] 3 0 0 13 [--------] 0 0 0 00 [--------] > +[NAME] 0 0 0 00 [--------] 0 3 500000 00 [--------] 0 0 0 00 [--------] > + > +*** push past the soft inode limit > +[ROOT] 0 0 0 00 [--------] 3 0 0 13 [--------] 0 0 0 00 [--------] > +[NAME] 0 0 0 00 [--------] 4 3 500000 01 [7 days] 0 0 0 00 [--------] > + > +*** push further past the soft inode limit > +[ROOT] 0 0 0 00 [--------] 3 0 0 13 [--------] 0 0 0 00 [--------] > +[NAME] 0 0 0 00 [--------] 8 3 500000 05 [7 days] 0 0 0 00 [--------] > + > +*** push past the soft inode warning limit > +[ROOT] 0 0 0 00 [--------] 3 0 0 13 [--------] 0 0 0 00 [--------] > +[NAME] 0 0 0 00 [--------] 16 3 500000 13 [7 days] 0 0 0 00 [--------] > + > +*** unmount > +*** group > +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 > + > +*** report initial settings > +[ROOT] 0 0 0 00 [--------] 3 0 0 13 [--------] 0 0 0 00 [--------] > +[NAME] 0 0 0 00 [--------] 0 3 500000 00 [--------] 0 0 0 00 [--------] > + > +*** push past the soft inode limit > +[ROOT] 0 0 0 00 [--------] 3 0 0 13 [--------] 0 0 0 00 [--------] > +[NAME] 0 0 0 00 [--------] 4 3 500000 01 [7 days] 0 0 0 00 [--------] > + > +*** push further past the soft inode limit > +[ROOT] 0 0 0 00 [--------] 3 0 0 13 [--------] 0 0 0 00 [--------] > +[NAME] 0 0 0 00 [--------] 8 3 500000 05 [7 days] 0 0 0 00 [--------] > + > +*** push past the soft inode warning limit > +[ROOT] 0 0 0 00 [--------] 3 0 0 13 [--------] 0 0 0 00 [--------] > +[NAME] 0 0 0 00 [--------] 16 3 500000 13 [7 days] 0 0 0 00 [--------] > + > +*** unmount > +*** uqnoenforce > +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 > + > +*** report initial settings > +[ROOT] 0 0 0 00 [--------] 3 0 0 13 [--------] 0 0 0 00 [--------] > +[NAME] 0 0 0 00 [--------] 0 3 500000 00 [--------] 0 0 0 00 [--------] > + > +*** push past the soft inode limit > +[ROOT] 0 0 0 00 [--------] 3 0 0 13 [--------] 0 0 0 00 [--------] > +[NAME] 0 0 0 00 [--------] 4 3 500000 00 [--------] 0 0 0 00 [--------] > + > +*** push further past the soft inode limit > +[ROOT] 0 0 0 00 [--------] 3 0 0 13 [--------] 0 0 0 00 [--------] > +[NAME] 0 0 0 00 [--------] 8 3 500000 00 [--------] 0 0 0 00 [--------] > + > +*** push past the soft inode warning limit > +[ROOT] 0 0 0 00 [--------] 3 0 0 13 [--------] 0 0 0 00 [--------] > +[NAME] 0 0 0 00 [--------] 18 3 500000 00 [--------] 0 0 0 00 [--------] > + > +*** unmount > +*** gqnoenforce > +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 > + > +*** report initial settings > +[ROOT] 0 0 0 00 [--------] 3 0 0 13 [--------] 0 0 0 00 [--------] > +[NAME] 0 0 0 00 [--------] 0 3 500000 00 [--------] 0 0 0 00 [--------] > + > +*** push past the soft inode limit > +[ROOT] 0 0 0 00 [--------] 3 0 0 13 [--------] 0 0 0 00 [--------] > +[NAME] 0 0 0 00 [--------] 4 3 500000 00 [--------] 0 0 0 00 [--------] > + > +*** push further past the soft inode limit > +[ROOT] 0 0 0 00 [--------] 3 0 0 13 [--------] 0 0 0 00 [--------] > +[NAME] 0 0 0 00 [--------] 8 3 500000 00 [--------] 0 0 0 00 [--------] > + > +*** push past the soft inode warning limit > +[ROOT] 0 0 0 00 [--------] 3 0 0 13 [--------] 0 0 0 00 [--------] > +[NAME] 0 0 0 00 [--------] 18 3 500000 00 [--------] 0 0 0 00 [--------] > + > +*** unmount > +*** pquota > +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 > + > +*** report initial settings > +[ROOT] 0 0 0 00 [--------] 3 0 0 13 [--------] 0 0 0 00 [--------] > +[NAME] 0 0 0 00 [--------] 0 3 500000 00 [--------] 0 0 0 00 [--------] > + > +*** push past the soft inode limit > +[ROOT] 0 0 0 00 [--------] 3 0 0 13 [--------] 0 0 0 00 [--------] > +[NAME] 0 0 0 00 [--------] 4 3 500000 02 [7 days] 0 0 0 00 [--------] At this point in the test we have created 4 files. 1. softok{1,2,3} 2. softwarn1 So we have exceeded the soft inode limit (i.e. 3) once. But the warning has been issued twice. _file_as_id() changes the project id of parent of each of the above files. In this case all the above listed files have $SCRATCH_MNT as the parent. So by the time softok2 is created we have already reached the soft inode limit of 3 (parent and the two softok{1,2} files) and creation of softok3 and softwarn1 generates the two warnings listed above. If this explaination is correct, shouldn't 'Used' inode count have a value of 5 (including the inode associated with $SCRATCH_MNT)? -- chandan