Re: [PATCH] common/rc: specifically make new xfs in _test_mkfs

[Eryu Guan <guan@eryu.me>]

On Thu, Mar 11, 2021 at 08:12:13PM +0800, Zorro Lang wrote:
> When we test different filesystems with different sections in config
> file, always hit below failure:
>    ...
>    our local _test_mkfs routine ...
>    mkfs.xfs: /dev/vdb1 appears to contain an existing filesystem (xfs)
>    mkfs.xfs: Use the -f option to force overwrite.
>    check: failed to mkfs $TEST_DEV using specified options
>    ...
> 
> To fix this problem, change the _test_mkfs to deal with xfs creation
> properly. Due to xfstests uses _test_mkfs rarely, currently only in
> check program, so I don't intend to write a whole new series of
> _test_mkfs_xfs_* functions likes what _scratch_mkfs_xfs_* does.
> 
> Reported-by: Carlos Maiolino <cmaiolino@redhat.com>
> Signed-off-by: Zorro Lang <zlang@redhat.com>

I also have defined different test sections in config file to test
different filesysms, but I didn't hit this failure. And it turns out
that I have "-f" in MKFS_OPTIONS, e.g.

	[xfs_prjquota_crc]
	FSTYP=xfs
	MKFS_OPTIONS="-f -b size=4k -m crc=1"
	MOUNT_OPTIONS="-o prjquota"

	[xfs_allquota_reflink]
	FSTYP=xfs
	MKFS_OPTIONS="-f -b size=4k -m crc=1,reflink=1,rmapbt=1"
	MOUNT_OPTIONS="-o usrquota,grpquota,prjquota"

And I think that's the way to fix it.

Thanks,
Eryu

> ---
>  common/rc | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/common/rc b/common/rc
> index 0ce3cb0d..c783def7 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -258,6 +258,7 @@ _test_options()
>  
>      case $type in
>      mkfs)
> +	TEST_OPTIONS="$TEST_OPTIONS -f"
>  	rt_opt="-r"
>          log_opt="-l"
>  	;;
> @@ -633,6 +634,15 @@ _test_mkfs()
>      ext2|ext3|ext4)
>  	$MKFS_PROG -t $FSTYP -- -F $MKFS_OPTIONS $* $TEST_DEV
>  	;;
> +    xfs)
> +	local mkfs_opts=$*
> +
> +	if [ -n "$XFS_MKFS_HAS_NO_META_SUPPORT" ]; then
> +		mkfs_opts=`echo $mkfs_opts | sed "s/-m\s\+\S\+//g"`
> +	fi
> +	_test_options mkfs
> +	$MKFS_XFS_PROG $TEST_OPTIONS $MKFS_OPTIONS $mkfs_opts $TEST_DEV
> +	;;
>      *)
>  	yes | $MKFS_PROG -t $FSTYP -- $MKFS_OPTIONS $* $TEST_DEV
>  	;;
> -- 
> 2.29.2