[07/17] xfs/128: cycle_mount the scratch device, not the test device
diff mbox

Message ID 146914482100.11762.3197784490090678443.stgit@birch.djwong.org
State Not Applicable, archived
Headers show

Commit Message

Darrick J. Wong July 21, 2016, 11:47 p.m. UTC
This test uses the scratch device, so cycle that, not the test dev.
This is also a xfs_fsr test, so put it in the fsr group.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tests/xfs/128   |    7 ++++---
 tests/xfs/group |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

Comments

Christoph Hellwig Aug. 1, 2016, 6:27 a.m. UTC | #1
On Thu, Jul 21, 2016 at 04:47:01PM -0700, Darrick J. Wong wrote:
> This test uses the scratch device, so cycle that, not the test dev.
> This is also a xfs_fsr test, so put it in the fsr group.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

Looks fine,

Reviewed-by: Christoph Hellwig <hch@lst.de>
Eryu Guan Aug. 3, 2016, 9:37 a.m. UTC | #2
On Thu, Jul 21, 2016 at 04:47:01PM -0700, Darrick J. Wong wrote:
> This test uses the scratch device, so cycle that, not the test dev.
> This is also a xfs_fsr test, so put it in the fsr group.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
>  tests/xfs/128   |    7 ++++---
>  tests/xfs/group |    2 +-
>  2 files changed, 5 insertions(+), 4 deletions(-)
> 
> 
> diff --git a/tests/xfs/128 b/tests/xfs/128
> index 8758d7e..2e756d5 100755
> --- a/tests/xfs/128
> +++ b/tests/xfs/128
> @@ -66,7 +66,7 @@ _pwrite_byte 0x61 0 $((blks * blksz)) $testdir/file1 >> $seqres.full
>  _cp_reflink $testdir/file1 $testdir/file2
>  _cp_reflink $testdir/file2 $testdir/file3
>  _cp_reflink $testdir/file3 $testdir/file4
> -_test_cycle_mount
> +_scratch_cycle_mount
>  free_blocks1=$(stat -f $testdir -c '%f')
>  
>  md5sum $testdir/file1 | _filter_scratch
> @@ -82,7 +82,7 @@ c04=$(_md5_checksum $testdir/file4)
>  echo "CoW the reflink copies"
>  _pwrite_byte 0x62 $blksz $blksz $testdir/file2 >> $seqres.full
>  _pwrite_byte 0x63 $(( blksz * (blks - 1) )) $blksz $testdir/file3 >> $seqres.full
> -_test_cycle_mount
> +_scratch_cycle_mount
>  free_blocks2=$(stat -f $testdir -c '%f')
>  
>  md5sum $testdir/file1 | _filter_scratch
> @@ -97,11 +97,12 @@ c14=$(_md5_checksum $testdir/file4)
>  
>  echo "Defragment"
>  lsattr -l $testdir/ | _filter_scratch | _filter_spaces
> +filefrag -v $testdir/file* >> $seqres.full

Is this intentional? Use $FILEFRAG_PROG instead and add

_require_command "$FILEFRAG_PROG" "filefrag"

at the beginning of the test?

Thanks,
Eryu

>  $XFS_FSR_PROG -v -d $testdir/file1 >> $seqres.full
>  $XFS_FSR_PROG -v -d $testdir/file2 >> $seqres.full # fsr probably breaks the link
>  $XFS_FSR_PROG -v -d $testdir/file3 >> $seqres.full # fsr probably breaks the link
>  $XFS_FSR_PROG -v -d $testdir/file4 >> $seqres.full # fsr probably ignores this file
> -_test_cycle_mount
> +_scratch_cycle_mount
>  free_blocks3=$(stat -f $testdir -c '%f')
>  
>  md5sum $testdir/file1 | _filter_scratch
> diff --git a/tests/xfs/group b/tests/xfs/group
> index aa3b3ec..5ccf3d6 100644
> --- a/tests/xfs/group
> +++ b/tests/xfs/group
> @@ -125,7 +125,7 @@
>  125 fuzzers
>  126 fuzzers
>  127 auto quick clone
> -128 auto quick clone
> +128 auto quick clone fsr
>  129 auto quick clone
>  130 fuzzers clone
>  131 auto quick clone
>
Darrick J. Wong Aug. 3, 2016, 10:09 p.m. UTC | #3
On Wed, Aug 03, 2016 at 05:37:55PM +0800, Eryu Guan wrote:
> On Thu, Jul 21, 2016 at 04:47:01PM -0700, Darrick J. Wong wrote:
> > This test uses the scratch device, so cycle that, not the test dev.
> > This is also a xfs_fsr test, so put it in the fsr group.
> > 
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> >  tests/xfs/128   |    7 ++++---
> >  tests/xfs/group |    2 +-
> >  2 files changed, 5 insertions(+), 4 deletions(-)
> > 
> > 
> > diff --git a/tests/xfs/128 b/tests/xfs/128
> > index 8758d7e..2e756d5 100755
> > --- a/tests/xfs/128
> > +++ b/tests/xfs/128
> > @@ -66,7 +66,7 @@ _pwrite_byte 0x61 0 $((blks * blksz)) $testdir/file1 >> $seqres.full
> >  _cp_reflink $testdir/file1 $testdir/file2
> >  _cp_reflink $testdir/file2 $testdir/file3
> >  _cp_reflink $testdir/file3 $testdir/file4
> > -_test_cycle_mount
> > +_scratch_cycle_mount
> >  free_blocks1=$(stat -f $testdir -c '%f')
> >  
> >  md5sum $testdir/file1 | _filter_scratch
> > @@ -82,7 +82,7 @@ c04=$(_md5_checksum $testdir/file4)
> >  echo "CoW the reflink copies"
> >  _pwrite_byte 0x62 $blksz $blksz $testdir/file2 >> $seqres.full
> >  _pwrite_byte 0x63 $(( blksz * (blks - 1) )) $blksz $testdir/file3 >> $seqres.full
> > -_test_cycle_mount
> > +_scratch_cycle_mount
> >  free_blocks2=$(stat -f $testdir -c '%f')
> >  
> >  md5sum $testdir/file1 | _filter_scratch
> > @@ -97,11 +97,12 @@ c14=$(_md5_checksum $testdir/file4)
> >  
> >  echo "Defragment"
> >  lsattr -l $testdir/ | _filter_scratch | _filter_spaces
> > +filefrag -v $testdir/file* >> $seqres.full
> 
> Is this intentional? Use $FILEFRAG_PROG instead and add
> 
> _require_command "$FILEFRAG_PROG" "filefrag"
> 
> at the beginning of the test?

Oops, that was a mistake.  Good catch!

--D
> 
> Thanks,
> Eryu
> 
> >  $XFS_FSR_PROG -v -d $testdir/file1 >> $seqres.full
> >  $XFS_FSR_PROG -v -d $testdir/file2 >> $seqres.full # fsr probably breaks the link
> >  $XFS_FSR_PROG -v -d $testdir/file3 >> $seqres.full # fsr probably breaks the link
> >  $XFS_FSR_PROG -v -d $testdir/file4 >> $seqres.full # fsr probably ignores this file
> > -_test_cycle_mount
> > +_scratch_cycle_mount
> >  free_blocks3=$(stat -f $testdir -c '%f')
> >  
> >  md5sum $testdir/file1 | _filter_scratch
> > diff --git a/tests/xfs/group b/tests/xfs/group
> > index aa3b3ec..5ccf3d6 100644
> > --- a/tests/xfs/group
> > +++ b/tests/xfs/group
> > @@ -125,7 +125,7 @@
> >  125 fuzzers
> >  126 fuzzers
> >  127 auto quick clone
> > -128 auto quick clone
> > +128 auto quick clone fsr
> >  129 auto quick clone
> >  130 fuzzers clone
> >  131 auto quick clone
> >

Patch
diff mbox

diff --git a/tests/xfs/128 b/tests/xfs/128
index 8758d7e..2e756d5 100755
--- a/tests/xfs/128
+++ b/tests/xfs/128
@@ -66,7 +66,7 @@  _pwrite_byte 0x61 0 $((blks * blksz)) $testdir/file1 >> $seqres.full
 _cp_reflink $testdir/file1 $testdir/file2
 _cp_reflink $testdir/file2 $testdir/file3
 _cp_reflink $testdir/file3 $testdir/file4
-_test_cycle_mount
+_scratch_cycle_mount
 free_blocks1=$(stat -f $testdir -c '%f')
 
 md5sum $testdir/file1 | _filter_scratch
@@ -82,7 +82,7 @@  c04=$(_md5_checksum $testdir/file4)
 echo "CoW the reflink copies"
 _pwrite_byte 0x62 $blksz $blksz $testdir/file2 >> $seqres.full
 _pwrite_byte 0x63 $(( blksz * (blks - 1) )) $blksz $testdir/file3 >> $seqres.full
-_test_cycle_mount
+_scratch_cycle_mount
 free_blocks2=$(stat -f $testdir -c '%f')
 
 md5sum $testdir/file1 | _filter_scratch
@@ -97,11 +97,12 @@  c14=$(_md5_checksum $testdir/file4)
 
 echo "Defragment"
 lsattr -l $testdir/ | _filter_scratch | _filter_spaces
+filefrag -v $testdir/file* >> $seqres.full
 $XFS_FSR_PROG -v -d $testdir/file1 >> $seqres.full
 $XFS_FSR_PROG -v -d $testdir/file2 >> $seqres.full # fsr probably breaks the link
 $XFS_FSR_PROG -v -d $testdir/file3 >> $seqres.full # fsr probably breaks the link
 $XFS_FSR_PROG -v -d $testdir/file4 >> $seqres.full # fsr probably ignores this file
-_test_cycle_mount
+_scratch_cycle_mount
 free_blocks3=$(stat -f $testdir -c '%f')
 
 md5sum $testdir/file1 | _filter_scratch
diff --git a/tests/xfs/group b/tests/xfs/group
index aa3b3ec..5ccf3d6 100644
--- a/tests/xfs/group
+++ b/tests/xfs/group
@@ -125,7 +125,7 @@ 
 125 fuzzers
 126 fuzzers
 127 auto quick clone
-128 auto quick clone
+128 auto quick clone fsr
 129 auto quick clone
 130 fuzzers clone
 131 auto quick clone