[PATCH] xfs/005: filter _scratch_mount output and fix golden output to match it

[PATCH] xfs/005: filter _scratch_mount output and fix golden output to match it

[Eryu Guan]

Failure message of _scratch_mount is something like:

mount: mount /dev/sda5 on /mnt/scratch failed: Structure needs cleaning

not

mount: Structure needs cleaning

Filter the output and fix the golden image to match the new output.

Signed-off-by: Eryu Guan <eguan@redhat.com>
---
 tests/xfs/005     | 2 +-
 tests/xfs/005.out | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/xfs/005 b/tests/xfs/005
index 94157c4..534f910 100755
--- a/tests/xfs/005
+++ b/tests/xfs/005
@@ -59,7 +59,7 @@ _scratch_mkfs_xfs -m crc=1 >> $seqres.full 2>&1 || _fail "mkfs failed"
 $XFS_IO_PROG -c "pwrite 224 4" $SCRATCH_DEV | _filter_xfs_io
 
 # should FAIL, the crc is bad; golden output contains mount failure
-_scratch_mount
+_scratch_mount 2>&1 | _filter_scratch
 
 # success, all done
 status=0
diff --git a/tests/xfs/005.out b/tests/xfs/005.out
index 13d0125..853e446 100644
--- a/tests/xfs/005.out
+++ b/tests/xfs/005.out
@@ -1,4 +1,4 @@
 QA output created by 005
 wrote 4/4 bytes at offset 224
 XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-mount: Structure needs cleaning
+mount: mount SCRATCH_DEV on SCRATCH_MNT failed: Structure needs cleaning
-- 
1.9.0

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

Re: [PATCH] xfs/005: filter _scratch_mount output and fix golden output to match it

[Brian Foster]

On Fri, May 23, 2014 at 12:17:09AM +0800, Eryu Guan wrote:
> Failure message of _scratch_mount is something like:
> 
> mount: mount /dev/sda5 on /mnt/scratch failed: Structure needs cleaning
> 
> not
> 
> mount: Structure needs cleaning
> 
> Filter the output and fix the golden image to match the new output.
> 
> Signed-off-by: Eryu Guan <eguan@redhat.com>
> ---

Reviewed-by: Brian Foster <bfoster@redhat.com>

>  tests/xfs/005     | 2 +-
>  tests/xfs/005.out | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/xfs/005 b/tests/xfs/005
> index 94157c4..534f910 100755
> --- a/tests/xfs/005
> +++ b/tests/xfs/005
> @@ -59,7 +59,7 @@ _scratch_mkfs_xfs -m crc=1 >> $seqres.full 2>&1 || _fail "mkfs failed"
>  $XFS_IO_PROG -c "pwrite 224 4" $SCRATCH_DEV | _filter_xfs_io
>  
>  # should FAIL, the crc is bad; golden output contains mount failure
> -_scratch_mount
> +_scratch_mount 2>&1 | _filter_scratch
>  
>  # success, all done
>  status=0
> diff --git a/tests/xfs/005.out b/tests/xfs/005.out
> index 13d0125..853e446 100644
> --- a/tests/xfs/005.out
> +++ b/tests/xfs/005.out
> @@ -1,4 +1,4 @@
>  QA output created by 005
>  wrote 4/4 bytes at offset 224
>  XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> -mount: Structure needs cleaning
> +mount: mount SCRATCH_DEV on SCRATCH_MNT failed: Structure needs cleaning
> -- 
> 1.9.0
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs

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

Re: [PATCH] xfs/005: filter _scratch_mount output and fix golden output to match it

[Dave Chinner]

On Fri, May 23, 2014 at 12:17:09AM +0800, Eryu Guan wrote:
> Failure message of _scratch_mount is something like:
> 
> mount: mount /dev/sda5 on /mnt/scratch failed: Structure needs cleaning
> 
> not
> 
> mount: Structure needs cleaning

Evidence to the contrary:

# MKFS_OPTIONS="-b size=1024 -m crc=1"  ./check xfs/005
FSTYP         -- xfs (debug)
PLATFORM      -- Linux/x86_64 test1 3.15.0-rc5-dgc+
MKFS_OPTIONS  -- -f -b size=1024 -m crc=1 /dev/vdb
MOUNT_OPTIONS -- /dev/vdb /mnt/scratch

xfs/005 0s ... 0s
Ran: xfs/005
Passed all 1 tests

# mount /dev/vdb /mnt/scratch
mount: Structure needs cleaning
# mount -V
mount from util-linux 2.20.1 (with libblkid and selinux support)
#

So xfs/005 is correct for a relatively recent mount binary.
What version of mount are you using?

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

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

Re: [PATCH] xfs/005: filter _scratch_mount output and fix golden output to match it

[Eryu Guan]

On Fri, May 23, 2014 at 09:34:49AM +1000, Dave Chinner wrote:
> On Fri, May 23, 2014 at 12:17:09AM +0800, Eryu Guan wrote:
> > Failure message of _scratch_mount is something like:
> > 
> > mount: mount /dev/sda5 on /mnt/scratch failed: Structure needs cleaning
> > 
> > not
> > 
> > mount: Structure needs cleaning
> 
> Evidence to the contrary:
> 
> # MKFS_OPTIONS="-b size=1024 -m crc=1"  ./check xfs/005
> FSTYP         -- xfs (debug)
> PLATFORM      -- Linux/x86_64 test1 3.15.0-rc5-dgc+
> MKFS_OPTIONS  -- -f -b size=1024 -m crc=1 /dev/vdb
> MOUNT_OPTIONS -- /dev/vdb /mnt/scratch
> 
> xfs/005 0s ... 0s
> Ran: xfs/005
> Passed all 1 tests
> 
> # mount /dev/vdb /mnt/scratch
> mount: Structure needs cleaning
> # mount -V
> mount from util-linux 2.20.1 (with libblkid and selinux support)
> #
> 
> So xfs/005 is correct for a relatively recent mount binary.
> What version of mount are you using?

I'm using util-linux 2.23
# mount -V
mount from util-linux 2.23.2 (libmount 2.23.0: selinux, debug, assert)

I looked into the util-linux git history, the new output has been
added to mount since v2.21-rc1~41, via commit ce433404.

So probably the output should be filtered to remove the device and
mount point info. I'll send a v2.

Thanks for the review!

Eryu
> 
> Cheers,
> 
> Dave.
> -- 
> Dave Chinner
> david@fromorbit.com
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs

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