On Wed, Feb 10, 2016 at 03:32:02AM +0800, Zorro Lang wrote:
> There's a bug for xfs_quota. After mount with uquota,gquota, If
> set the user/group default quota lower than specific user/group
> quota, the specific quota can't work well.
This description is not so clear to me, and ...
>
> This bug have an upstream patch:
> xfs: Split default quota limits by quota type
the commit log in this patch looks much better :) Can you please rewrite
the description?
And there's no need to include test number for new test, the number can
be changed in commit time. Something like:
"xfs: new case for ..."
is fine.
>
> Signed-off-by: Zorro Lang <zlang@xxxxxxxxxx>
> ---
> tests/xfs/169 | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
> tests/xfs/169.out | 5 ++
> tests/xfs/group | 1 +
> 3 files changed, 157 insertions(+)
> create mode 100755 tests/xfs/169
> create mode 100644 tests/xfs/169.out
>
> diff --git a/tests/xfs/169 b/tests/xfs/169
> new file mode 100755
> index 0000000..11f33e7
> --- /dev/null
> +++ b/tests/xfs/169
> @@ -0,0 +1,151 @@
> +#! /bin/bash
> +# FS QA Test 169
> +#
> +# This case for a bug about xfs default quota, after mount with
> +# uquota,gquota, if the default quota lower than specific quota,
> +# the specific quota can't work.
> +
Need a "#" in this line.
> +# An upstream patch for fix this bug:
> +#
> +# [PATCH] xfs: Split default quota limits by quota type V4
> +#
> +#-----------------------------------------------------------------------
> +# Copyright (c) 2016 YOUR NAME HERE. All Rights Reserved.
Replace "YOUR NAME HERE." by "Red Hat Inc."
> +#
> +# This program is free software; you can redistribute it and/or
> +# modify it under the terms of the GNU General Public License as
> +# published by the Free Software Foundation.
> +#
> +# This program is distributed in the hope that it would be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write the Free Software Foundation,
> +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
> +#-----------------------------------------------------------------------
> +#
> +
> +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
> +
> +# remove previous $seqres.full before test
> +rm -f $seqres.full
> +
> +# real QA test starts here
> +
> +# Modify as appropriate.
The empty line and above comment is not needed anymore.
> +_supported_fs xfs
> +_supported_os Linux
> +_require_scratch
> +_require_quota
> +
> +_require_user fsgqa
> +_require_group fsgqa
fsgqa is the default required user and group in _require_user and
_require_group, no need to pass fsgqa as argument.
> +
> +do_test()
> +{
> + local qname=$1
> + local type
> + local rc=0
> +
> + if [ "$qname" = "user" ]
> + then
We use
if [ ... ]; then
elif [ ... ]; then
else
fi
and
for ... ; do
done
format in fstests.
> + type="-u"
> + elif [ "$qname" = "group" ]
> + then
> + type="-g"
> + else
> + _fail "wrong quota type name - $qname"
No need to _fail, return is enough and test could continue.
> + fi
> +
> + xfs_quota -x -c "limit bsoft=20M bhard=20M isoft=200 ihard=200 $type -d" $SCRATCH_MNT >>$seqres.full 2>&1
Replace all "xfs_quota" with $XFS_QUOTA_PROG
> + [ $? -ne 0 ] && _fail "Can't set limit bsoft=20M bhard=20M isoft=200 ihard=200 $type -d to $SCRATCH_MNT"
> + DEF_BHARD=`xfs_quota -x -c "report $type -N -b" $SCRATCH_MNT | awk '/^root / {print $4}'`
> + DEF_IHARD=`xfs_quota -x -c "report $type -N -i" $SCRATCH_MNT | awk '/^root / {print $4}'`
> +
> + xfs_quota -x -c "limit bsoft=40M bhard=40M isoft=400 ihard=400 $type fsgqa" $SCRATCH_MNT >>$seqres.full 2>&1
> + [ $? -ne 0 ] && _fail "Can't set limit bsoft=40M bhard=40M isoft=400 ihard=400 $type fsgqa to $SCRATCH_MNT"
> + QA_BHARD=`xfs_quota -x -c "report $type -N -b" $SCRATCH_MNT | awk '/^fsgqa / {print $4}'`
> + QA_IHARD=`xfs_quota -x -c "report $type -N -i" $SCRATCH_MNT | awk '/^fsgqa / {print $4}'`
> +
> + if [ "$QA_BHARD" = "$DEF_BHARD" -o "$QA_IHARD" = "$DEF_IHARD" ]
> + then
> + _fail "Fail to set specific quota to fsgqa"
> + fi
You could print expected quota value to stdout and the golden image
could catch any unexpected qouta value. So you don't need to detect for
xfs_quota command failure nor xfs_quota -c report output.
> +
> + ## blocks default quota test ##
> + sudo -u fsgqa -s dd if=/dev/zero of=${SCRATCH_MNT}/data bs=1M count=30 >>$seqres.full 2>&1
> + sync
We already have helper _user_do, and we prefer xfs_io not dd, so
_user_do "$XFS_IO_PROG -fc \"pwrite 0 30M\" -c \"fsync\" $SCRATCH_MNT/data" >>$seqres.full 2>&1
> +
> + USED_B=`xfs_quota -x -c "report $type -N -b" $SCRATCH_MNT | awk '/^fsgqa / {print $2}'`
> + if [ $USED_B -gt $DEF_BHARD -a $USED_B -le $QA_BHARD ]
> + then
> + echo "$qname blocks quota test pass"
> + else
> + rc=1
> + echo "$qname blocks quota test fail"
> + fi
The block check can also be done by the golden image.
> +
> + rm -f ${SCRATCH_MNT}/data >/dev/null 2>&1
> +
> + ## inode default quota test ##
> + for ((i=0; i<300; i++))
> + do
> + sudo -u fsgqa -s touch ${SCRATCH_MNT}/file${i} >>$seqres.full 2>&1
"echo -n >$SCRATCH_MNT/file$i" is much faster to create new empty file
> + done
> + sync
> +
> + USED_I=`xfs_quota -x -c "report $type -N -i" $SCRATCH_MNT | awk '/^fsgqa / {print $2}'`
> + if [ $USED_I -gt $DEF_IHARD -a $USED_I -le $QA_IHARD ]
> + then
> + echo "$qname inode quota test pass"
> + else
> + rc=1
> + echo "$qname inode quota test fail"
> + fi
Here too, use golden image.
> +
> + rm -f ${SCRATCH_MNT}/file* >/dev/null 2>&1
> +
> + return $rc
> +}
> +
> +### user default quota test ###
> +_scratch_mkfs_xfs >/dev/null 2>&1
> +PAGESIZE=`src/feature -s`
> +_qmount_option "uquota,gquota,allocsize=$PAGESIZE"
> +_qmount
> +chmod ugo+rwx $SCRATCH_MNT
The chmod part is done in _qmount
> +
> +do_test user || exit
Continue the test, don't exit.
> +
> +### group default quota test ###
> +umount $SCRATCH_MNT
_scratch_unmount
> +_scratch_mkfs_xfs >/dev/null 2>&1
> +_qmount_option "gquota,uquota,allocsize=$PAGESIZE"
> +_qmount
> +chmod ugo+rwx $SCRATCH_MNT
> +
> +do_test group || exit
Here too, remove chmod call and continue the test on failure.
Thanks,
Eryu
> +
> +# success, all done
> +status=0
> +exit
> diff --git a/tests/xfs/169.out b/tests/xfs/169.out
> new file mode 100644
> index 0000000..0d81280
> --- /dev/null
> +++ b/tests/xfs/169.out
> @@ -0,0 +1,5 @@
> +QA output created by 169
> +user blocks quota test pass
> +user inode quota test pass
> +group blocks quota test pass
> +group inode quota test pass
> diff --git a/tests/xfs/group b/tests/xfs/group
> index 2db3520..ffaca65 100644
> --- a/tests/xfs/group
> +++ b/tests/xfs/group
> @@ -166,6 +166,7 @@
> 166 rw metadata auto quick
> 167 rw metadata auto stress
> 168 dmapi
> +169 auto quick quota
> 170 rw filestreams auto quick
> 171 rw filestreams
> 172 rw filestreams
> --
> 1.9.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
