[PATCH, RFC] xfstests: test quota log replay in 087

[PATCH, RFC] xfstests: test quota log replay in 087

[Christoph Hellwig]

By mounting the filesystem with quotas enabled in 087 we exercise the
replay of the quota log items in this tests, which we otherwise don't
test in xfstests.  OSS bugzilla #855 is an example of something caught
by this.

Does this look okay, or should I add a duplicate of 
087 with quotas enabled instead?


Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: xfstests-dev/087
===================================================================
--- xfstests-dev.orig/087	2010-01-10 21:14:27.000000000 +0000
+++ xfstests-dev/087	2010-01-10 21:15:45.000000000 +0000
@@ -38,6 +38,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2
 . ./common.rc
 . ./common.filter
 . ./common.log
+. ./common.quota
 
 _do_meta()
 {
@@ -59,6 +60,7 @@ _supported_os IRIX Linux
 rm -f $seq.full $tmp.*
 _require_scratch
 _require_v2log 
+_require_xfs_quota
 
 echo "*** init FS"
 umount $SCRATCH_DEV >/dev/null 2>&1
@@ -98,7 +100,7 @@ do
 
     # mount the FS
     _echofull "mount"
-    if ! _scratch_mount >>$seq.full 2>&1; then
+    if ! _scratch_mount -o uquota >>$seq.full 2>&1; then
 	_echofull "mount failed: $MOUNT_OPTIONS"
 	continue
     fi
@@ -124,7 +126,7 @@ do
     _scratch_xfs_logprint -n >>$seq.full 2>&1
 
     _echofull "mount with replay"
-    _scratch_mount >>$seq.full 2>&1 \
+    _scratch_mount -o uquota >>$seq.full 2>&1 \
 	|| _fail "mount failed: $MOUNT_OPTIONS"
 
     # check on what FS looks like after log recovery
Index: xfstests-dev/group
===================================================================
--- xfstests-dev.orig/group	2010-01-10 21:21:18.000000000 +0000
+++ xfstests-dev/group	2010-01-10 21:21:24.000000000 +0000
@@ -193,7 +193,7 @@ prealloc
 084 ioctl rw auto
 085 log auto quick
 086 log v2log auto
-087 log v2log auto
+087 log v2log auto quota
 088 perms auto quick
 089 metadata auto
 090 rw auto

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH, RFC] xfstests: test quota log replay in 087

[Dave Chinner]

On Sun, Jan 10, 2010 at 04:26:19PM -0500, Christoph Hellwig wrote:
> By mounting the filesystem with quotas enabled in 087 we exercise the
> replay of the quota log items in this tests, which we otherwise don't
> test in xfstests.  OSS bugzilla #855 is an example of something caught
> by this.
> 
> Does this look okay, or should I add a duplicate of 
> 087 with quotas enabled instead?

I think having 087 cover quotas as well is fine. Adding a separate
test just for quotas doesn't provide any extra coverage compared to
this patch.


> @@ -98,7 +100,7 @@ do
>  
>      # mount the FS
>      _echofull "mount"
> -    if ! _scratch_mount >>$seq.full 2>&1; then
> +    if ! _scratch_mount -o uquota >>$seq.full 2>&1; then

My only question is whether this will work if uquota is set up as a
global option. I haven't looked into it yet, but there appears to be
several different ways that uquota is specified in other tests:

052:_qmount_option uquota
108:export MOUNT_OPTIONS="-ouquota"
116:mount -o uquota $SCRATCH_DEV $SCRATCH_MNT
220:_scratch_mount -o uquota

Some consistency would be nice, but I don't think it's a problem
for this patch right now.

Reviewed-by: Dave Chinner <david@fromorbit.com>

-- 
Dave Chinner
david@fromorbit.com

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs