Re: [PATCH 09/13] xfs/2304: version of generic/388 that run xfs_scrub -x for each iteration

["Darrick J. Wong" <djwong@kernel.org>]

On Thu, Sep 24, 2026 at 12:07:50PM +0200, Christoph Hellwig wrote:
> To check both the metadata integrity and file system checksums after
> log replay.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  tests/xfs/2304     | 61 ++++++++++++++++++++++++++++++++++++++++++++++
>  tests/xfs/2304.out |  2 ++
>  2 files changed, 63 insertions(+)
>  create mode 100755 tests/xfs/2304
>  create mode 100644 tests/xfs/2304.out
> 
> diff --git a/tests/xfs/2304 b/tests/xfs/2304
> new file mode 100755
> index 000000000000..ad4f45d79057
> --- /dev/null
> +++ b/tests/xfs/2304
> @@ -0,0 +1,61 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +# Copyright (c) 2016 Red Hat, Inc.  All Rights Reserved.
> +#
> +# FS QA Test No. 2304
> +#
> +# Copied from generic/388, with added xfs_scrub -x calls for each iteration to
> +# verify the integrity of all file data and metadata.
> +#
> +# Test XFS log recovery ordering on v5 superblock filesystems. XFS had a problem
> +# where it would incorrectly replay older modifications from the log over more
> +# recent versions of metadata due to failure to update metadata LSNs during log
> +# recovery. This could result in false positive reports of corruption during log
> +# recovery and permanent mount failure.
> +#
> +# To test this situation, run frequent shutdowns immediately after log recovery.
> +# Ensure that log recovery does not recover stale modifications and cause
> +# spurious corruption reports and/or mount failures.
> +#
> +. ./common/preamble
> +_begin_fstest shutdown auto log metadata recoveryloop datacsum
> +
> +_require_scratch
> +_require_local_device $SCRATCH_DEV
> +_require_scratch_shutdown
> +
> +echo "Silence is golden."
> +
> +_scratch_mkfs >> $seqres.full 2>&1
> +_require_metadata_journaling $SCRATCH_DEV
> +_scratch_mount
> +_require_scratch_xfs_scrub
> +
> +while _soak_loop_running $((50 * TIME_FACTOR)); do
> +	_run_fsstress_bg -d $SCRATCH_MNT -n 999999 -p 4
> +
> +	# purposely include 0 second sleeps to test shutdown immediately after
> +	# recovery
> +	sleep $((RANDOM % 3))
> +	_scratch_shutdown
> +
> +	_kill_fsstress
> +
> +	# Toggle between rw and ro mounts for recovery. Quit if any mount
> +	# attempt fails so we don't shutdown the host fs.
> +	if [ $((RANDOM % 2)) -eq 0 ]; then
> +		_scratch_cycle_mount || _fail "cycle mount failed"
> +	else
> +		_scratch_cycle_mount "ro" || _fail "cycle ro mount failed"
> +		_scratch_cycle_mount || _fail "cycle rw mount failed"
> +	fi
> +
> +	$XFS_SCRUB_PROG -x $SCRATCH_MNT >> $seqres.full 2>&1

I think we should just change generic/388 to run xfs_scrub after
recovery, and add -x if data checksums are enabled?  That /would/ have
the effect of catching recovery errors (or scrub bugs) earlier.

Though I wonder how much that reduces the number of loop iterations over
a given SOAK_DURATION?

--D

> +	if [ $? -ne 0 ]; then
> +		_fail "scrub found errors"
> +	fi
> +done
> +
> +# success, all done
> +status=0
> +exit
> diff --git a/tests/xfs/2304.out b/tests/xfs/2304.out
> new file mode 100644
> index 000000000000..07ee489db9fa
> --- /dev/null
> +++ b/tests/xfs/2304.out
> @@ -0,0 +1,2 @@
> +QA output created by 2304
> +Silence is golden.
> -- 
> 2.53.0
> 
>