Re: [PATCH V3 06/19] Fix xfs/139 to work with 64k block size

Darrick J. Wong
2018-09-18T03:59:07Z

On Wed, Sep 12, 2018 at 11:56:13AM +0530, Chandan Rajendra wrote:
> For 64k block size, the agsize provided in the test causes mkfs.xfs to
> fail due to insufficient log space. Hence this commit computes agsize
> based on block size of the filesystem.
>
> Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
> ---
> tests/xfs/139 | 15 +++++++++------
> tests/xfs/139.out | 8 ++++++--
> 2 files changed, 15 insertions(+), 8 deletions(-)
>
> diff --git a/tests/xfs/139 b/tests/xfs/139
> index 2a26635..9ab74c8 100755
> --- a/tests/xfs/139
> +++ b/tests/xfs/139
> @@ -34,17 +34,20 @@ _require_cp_reflink
>
> rm -f $seqres.full
>
> +_scratch_mkfs >/dev/null 2>&1
> +_scratch_mount
> +blksz=$(_get_block_size $SCRATCH_MNT)
> +_scratch_unmount
> +
> echo "Format and mount"
> -_scratch_mkfs -d agsize=$((32 * 1048576)) > $seqres.full 2>&1
> +_scratch_mkfs -d agsize=$((4400 * $blksz)) > $seqres.full 2>&1

Uh... how did this magic 4400 number come about? I'd have expected
8192...?

--D

> _scratch_mount >> $seqres.full 2>&1
>
> testdir=$SCRATCH_MNT/test-$seq
> mkdir $testdir
> -blksz="$(_get_block_size $testdir)"
>
> echo "Create the original files"
> -sz=$((48 * 1048576))
> -nr=$((sz / blksz))
> +sz=$((4800 * $blksz))
> _pwrite_byte 0x61 0 $sz $testdir/file1 >> $seqres.full
> _cp_reflink $testdir/file1 $testdir/file2 >> $seqres.full
> _scratch_cycle_mount
> @@ -54,8 +57,8 @@ _pwrite_byte 0x62 0 $sz $testdir/file1 >> $seqres.full
> _scratch_cycle_mount
>
> echo "Compare files"
> -md5sum $testdir/file1 | _filter_scratch
> -md5sum $testdir/file2 | _filter_scratch
> +od -t x1 $testdir/file1 | _filter_od
> +od -t x1 $testdir/file2 | _filter_od
> #filefrag -v $testdir/file1 $testdir/file2
>
> # success, all done
> diff --git a/tests/xfs/139.out b/tests/xfs/139.out
> index dc6a31e..55e03d6 100644
> --- a/tests/xfs/139.out
> +++ b/tests/xfs/139.out
> @@ -3,5 +3,9 @@ Format and mount
> Create the original files
> CoW every other block
> Compare files
> -673c759fb131ccf3336c4f8c549a497e SCRATCH_MNT/test-139/file1
> -dc802351f6717547cbf4c951b294f952 SCRATCH_MNT/test-139/file2
> +0 62 62 62 62 62 62 62 62 62 62 62 62 62 62 62 62
> +*
> +11300
> +0 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61
> +*
> +11300
> --
> 2.9.5
>