On Tue, Dec 13, 2022 at 11:45:33AM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@xxxxxxxxxx>
>
> This line in __scratch_xfs_fuzz_mdrestore:
>
> test -e "${POPULATE_METADUMP}"
>
> Breaks spectacularly on a setup that uses DUMP_COMPRESSOR to compress
> the metadump files, because the metadump files get the compression
> program added to the name (e.g. "${POPULATE_METADUMP}.xz"). The check
> is wrong, and since the naming policy is an implementation detail of
> _xfs_mdrestore, let's get rid of the -e test.
>
> However, we still need a way to fail the test if the metadump cannot be
> restored. _xfs_mdrestore returns nonzero on failure, so use that
> instead.
>
> Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
> ---
Looks good to me,
Reviewed-by: Zorro Lang <zlang@xxxxxxxxxx>
> common/fuzzy | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
>
> diff --git a/common/fuzzy b/common/fuzzy
> index e634815eec..49c850f2d5 100644
> --- a/common/fuzzy
> +++ b/common/fuzzy
> @@ -156,10 +156,9 @@ __scratch_xfs_fuzz_unmount()
> # Restore metadata to scratch device prior to field-fuzzing.
> __scratch_xfs_fuzz_mdrestore()
> {
> - test -e "${POPULATE_METADUMP}" || _fail "Need to set POPULATE_METADUMP"
> -
> __scratch_xfs_fuzz_unmount
> - _xfs_mdrestore "${POPULATE_METADUMP}" "${SCRATCH_DEV}" compress
> + _xfs_mdrestore "${POPULATE_METADUMP}" "${SCRATCH_DEV}" compress || \
> + _fail "${POPULATE_METADUMP}: Could not find metadump to restore?"
> }
>
> __fuzz_notify() {
>
