[v2] xfs: test statfs on project quota directory
diff mbox series

Message ID 20190716093550.23059-1-zlang@redhat.com
State New
Headers show
Series
  • [v2] xfs: test statfs on project quota directory
Related show

Commit Message

Zorro Lang July 16, 2019, 9:35 a.m. UTC
There's a bug on xfs cause statfs get negative f_ffree value from
a project quota directory. It's fixed by "de7243057 fs/xfs: fix
f_ffree value for statfs when project quota is set". So add statfs
testing on project quota block and inode count limit.

Signed-off-by: Zorro Lang <zlang@redhat.com>
---

Hi,

This V2 patch changes this case from a generic case to a xfs only case, due to
ext4 has different behavior.

V1 history:
https://marc.info/?l=linux-xfs&m=156048436902910&w=2

Thanks,
Zorro

 tests/xfs/509     | 72 +++++++++++++++++++++++++++++++++++++++++++++++
 tests/xfs/509.out |  3 ++
 tests/xfs/group   |  1 +
 3 files changed, 76 insertions(+)
 create mode 100755 tests/xfs/509
 create mode 100644 tests/xfs/509.out

Comments

Carlos Maiolino July 16, 2019, 11:06 a.m. UTC | #1
Hi Zoro.

On Tue, Jul 16, 2019 at 05:35:50PM +0800, Zorro Lang wrote:
> There's a bug on xfs cause statfs get negative f_ffree value from
> a project quota directory. It's fixed by "de7243057 fs/xfs: fix
> f_ffree value for statfs when project quota is set". So add statfs
> testing on project quota block and inode count limit.
> 
> Signed-off-by: Zorro Lang <zlang@redhat.com>
> ---
> 
> Hi,
> 
> This V2 patch changes this case from a generic case to a xfs only case, due to
> ext4 has different behavior.
> 
.
.
.
> +# real QA test starts here
> +_supported_fs xfs
> +_supported_os Linux
> +_require_scratch
> +_require_xfs_quota
> +
> +_scratch_mkfs >/dev/null 2>&1
> +_scratch_enable_pquota
> +_qmount_option "prjquota"
> +_qmount
> +_require_prjquota $SCRATCH_DEV
> +
> +# Create a directory to be project object, and create a file to take 64k space
> +mkdir $SCRATCH_MNT/t
> +$XFS_IO_PROG -f -c "pwrite 0 65536" -c sync $SCRATCH_MNT/t/file >>$seqres.full
> +
> +# Setup temporary replacements for /etc/projects and /etc/projid
> +cat >$tmp.projects <<EOF
> +42:$SCRATCH_MNT/t
> +EOF
> +
> +cat >$tmp.projid <<EOF
> +answer:42
> +EOF

> +
> +quota_cmd="$XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid"
> +$quota_cmd -x -c 'project -s answer' $SCRATCH_MNT >/dev/null 2>&1
> +$quota_cmd -x -c 'limit -p isoft=53 bsoft=100m answer' $SCRATCH_MNT

I wonder if is there any specific reason why you're using project quota config
files for this test? Maybe it would simplify the test if you replace the config
files and the quota command by something like:

$quota_cmd -x -c 'answer -s -p $SCRATCH_MNT/t 42' $SCRATCH_MNT >/dev/null 2>&1
$quota_cmd -x -c 'limit -p isoft=53 bsoft=100m 42' $SCRATCH_MNT

Which would remove from the test all the configuration files setup


> +
> +# The itotal and size should be 53 and 102400(k), as above project quota limit.
> +# The isued and used should be 2 and 64(k), as this case takes. But ext4 always
> +# shows more 4k 'used' space than XFS, it prints 68k at here. So filter the
> +# 6[48] at the end.

If this is a XFS only test, we don't need this comment right?

> +df -k --output=file,itotal,iused,size,used $SCRATCH_MNT/t | \
> +	_filter_scratch | _filter_spaces
> +

Cheers

Patch
diff mbox series

diff --git a/tests/xfs/509 b/tests/xfs/509
new file mode 100755
index 00000000..d2e40bf3
--- /dev/null
+++ b/tests/xfs/509
@@ -0,0 +1,72 @@ 
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2019 Red Hat, Inc.  All Rights Reserved.
+#
+# FS QA Test No. 509
+#
+# Test statfs when project quota is set.
+# Uncover de7243057 fs/xfs: fix f_ffree value for statfs when project quota is set
+#
+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 /
+	_scratch_unmount
+	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
+_supported_fs xfs
+_supported_os Linux
+_require_scratch
+_require_xfs_quota
+
+_scratch_mkfs >/dev/null 2>&1
+_scratch_enable_pquota
+_qmount_option "prjquota"
+_qmount
+_require_prjquota $SCRATCH_DEV
+
+# Create a directory to be project object, and create a file to take 64k space
+mkdir $SCRATCH_MNT/t
+$XFS_IO_PROG -f -c "pwrite 0 65536" -c sync $SCRATCH_MNT/t/file >>$seqres.full
+
+# Setup temporary replacements for /etc/projects and /etc/projid
+cat >$tmp.projects <<EOF
+42:$SCRATCH_MNT/t
+EOF
+
+cat >$tmp.projid <<EOF
+answer:42
+EOF
+
+quota_cmd="$XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid"
+$quota_cmd -x -c 'project -s answer' $SCRATCH_MNT >/dev/null 2>&1
+$quota_cmd -x -c 'limit -p isoft=53 bsoft=100m answer' $SCRATCH_MNT
+
+# The itotal and size should be 53 and 102400(k), as above project quota limit.
+# The isued and used should be 2 and 64(k), as this case takes. But ext4 always
+# shows more 4k 'used' space than XFS, it prints 68k at here. So filter the
+# 6[48] at the end.
+df -k --output=file,itotal,iused,size,used $SCRATCH_MNT/t | \
+	_filter_scratch | _filter_spaces
+
+# success, all done
+status=0
+exit
diff --git a/tests/xfs/509.out b/tests/xfs/509.out
new file mode 100644
index 00000000..418b2dd7
--- /dev/null
+++ b/tests/xfs/509.out
@@ -0,0 +1,3 @@ 
+QA output created by 509
+File Inodes IUsed 1K-blocks Used
+SCRATCH_MNT/t 53 2 102400 64
diff --git a/tests/xfs/group b/tests/xfs/group
index 270d82ff..364a7ed5 100644
--- a/tests/xfs/group
+++ b/tests/xfs/group
@@ -506,3 +506,4 @@ 
 506 auto quick health
 507 clone
 508 auto quick quota
+509 auto quick quota