linux-xfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Zorro Lang <zlang@redhat.com>
Cc: fstests@vger.kernel.org, linux-xfs@vger.kernel.org
Subject: Re: [PATCH v2] xfs: test xfs_info on block device and mountpoint
Date: Sun, 23 Jun 2019 14:49:19 -0700	[thread overview]
Message-ID: <20190623214919.GD5387@magnolia> (raw)
In-Reply-To: <20190622153827.4448-1-zlang@redhat.com>

On Sat, Jun 22, 2019 at 11:38:27PM +0800, Zorro Lang wrote:
> There was a bug, xfs_info fails on a mounted block device:
> 
>   # xfs_info /dev/mapper/testdev
>   xfs_info: /dev/mapper/testdev contains a mounted filesystem
> 
>   fatal error -- couldn't initialize XFS library
> 
> xfsprogs has fixed it by:
> 
>   bbb43745 xfs_info: use findmnt to handle mounted block devices
> 
> Signed-off-by: Zorro Lang <zlang@redhat.com>

Aha!  I remembered something -- xfs/449 already checks for consistency
in the various xfs geometry reports that each command provides, so why
not just add the $XFS_INFO_PROG $SCRATCH_DEV case at the end?

--D

> ---
> 
> Thanks the reviewing from Darrick and Eryu,
> 
> V2 did below changes:
> 1) Compare the contents between the two xfs_info invocations in test_xfs_info()
> 2) document the commit that the case cover
> 3) Add more comments
> 4) Move the test on unmounted device to the end
> 
> Sorry Eryu, I'll keep the case number next time :)
> 
> Thanks,
> Zorro
> 
>  tests/xfs/1000     | 82 ++++++++++++++++++++++++++++++++++++++++++++++
>  tests/xfs/1000.out |  2 ++
>  tests/xfs/group    |  1 +
>  3 files changed, 85 insertions(+)
>  create mode 100755 tests/xfs/1000
>  create mode 100644 tests/xfs/1000.out
> 
> diff --git a/tests/xfs/1000 b/tests/xfs/1000
> new file mode 100755
> index 00000000..721bcdf2
> --- /dev/null
> +++ b/tests/xfs/1000
> @@ -0,0 +1,82 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +# Copyright (c) 2019 Red Hat, Inc.  All Rights Reserved.
> +#
> +# FS QA Test No. 1000
> +#
> +# test xfs_info on block device and mountpoint, uncover xfsprogs commit:
> +#    bbb43745 xfs_info: use findmnt to handle mounted block devices
> +#
> +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
> +
> +# remove previous $seqres.full before test
> +rm -f $seqres.full
> +
> +# real QA test starts here
> +_supported_fs xfs
> +_supported_os Linux
> +_require_scratch
> +
> +info_file=$tmp.$seq.info
> +
> +test_xfs_info()
> +{
> +	local target="$1"
> +	local tmpfile=$tmp.$seq.info.tmp
> +	local need_cmp=0
> +
> +	# save the *old* xfs_info file, to compare with the new one later
> +	if [ -f $info_file ]; then
> +		cat $info_file > $tmpfile
> +		need_cmp=1
> +	fi
> +
> +	$XFS_INFO_PROG $target > $info_file 2>&1
> +	if [ $? -ne 0 ];then
> +		echo "$XFS_INFO_PROG $target fails:"
> +		cat $info_file
> +	else
> +		cat $info_file >> $seqres.full
> +	fi
> +	# compare the contents between the two xfs_info invocations
> +	if [ $need_cmp -eq 1 ]; then
> +		diff $tmpfile $info_file
> +	fi
> +}
> +
> +_scratch_mkfs > $seqres.full 2>&1
> +_scratch_mount
> +# test mounted block device and mountpoint
> +test_xfs_info $SCRATCH_DEV
> +test_xfs_info $SCRATCH_MNT
> +
> +# test on unmounted block device
> +_scratch_unmount
> +# Due to new xfsprogs use xfs_db 'info' command to get the information of
> +# offline XFS, it supports running on a unmounted device. But old xfsprogs
> +# doesn't support it, so skip that.
> +$XFS_DB_PROG -c "info" $SCRATCH_DEV | grep -q "command info not found"
> +if [ $? -ne 0 ]; then
> +	test_xfs_info $SCRATCH_DEV
> +fi
> +
> +echo "Silence is golden"
> +# success, all done
> +status=0
> +exit
> diff --git a/tests/xfs/1000.out b/tests/xfs/1000.out
> new file mode 100644
> index 00000000..681b3b48
> --- /dev/null
> +++ b/tests/xfs/1000.out
> @@ -0,0 +1,2 @@
> +QA output created by 1000
> +Silence is golden
> diff --git a/tests/xfs/group b/tests/xfs/group
> index ffe4ae12..047fe332 100644
> --- a/tests/xfs/group
> +++ b/tests/xfs/group
> @@ -504,3 +504,4 @@
>  504 auto quick mkfs label
>  505 auto quick spaceman
>  506 auto quick health
> +1000 auto quick
> -- 
> 2.17.2
> 

  reply	other threads:[~2019-06-24  1:41 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-22 15:38 [PATCH v2] xfs: test xfs_info on block device and mountpoint Zorro Lang
2019-06-23 21:49 ` Darrick J. Wong [this message]
2019-06-24  1:21   ` Zorro Lang
2019-06-25  2:45     ` Eryu Guan
2019-06-25  7:16       ` Zorro Lang
2019-06-25 14:36         ` Darrick J. Wong
2019-06-25 17:12           ` Zorro Lang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190623214919.GD5387@magnolia \
    --to=darrick.wong@oracle.com \
    --cc=fstests@vger.kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    --cc=zlang@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).