a couple xfstests fixes for reflinks

a couple xfstests fixes for reflinks

[Christoph Hellwig]

The patches (against Darrick's for-dave branch) fix various failures I see
during testing XFS and NFS.

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 1/4] xfstests: fix scratch device filtering in 139

[Christoph Hellwig]

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 tests/xfs/139     | 4 ++--
 tests/xfs/139.out | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 tests/xfs/139

diff --git a/tests/xfs/139 b/tests/xfs/139
old mode 100644
new mode 100755
index 7400cf8..51c903e
--- a/tests/xfs/139
+++ b/tests/xfs/139
@@ -69,8 +69,8 @@ _pwrite_byte 0x62 0 $sz "$testdir/file1" >> "$seqres.full"
 _scratch_remount
 
 echo "Compare files"
-md5sum "$testdir/file1" | _filter_test_dir
-md5sum "$testdir/file2" | _filter_test_dir
+md5sum "$testdir/file1" | _filter_scratch
+md5sum "$testdir/file2" | _filter_scratch
 #filefrag -v "$testdir/file1" "$testdir/file2"
 
 echo "Check scratch fs"
diff --git a/tests/xfs/139.out b/tests/xfs/139.out
index 729e2d6..090e3af 100644
--- a/tests/xfs/139.out
+++ b/tests/xfs/139.out
@@ -3,6 +3,6 @@ Format and mount
 Create the original files
 CoW every other block
 Compare files
-673c759fb131ccf3336c4f8c549a497e  /opt/test-139/file1
-dc802351f6717547cbf4c951b294f952  /opt/test-139/file2
+673c759fb131ccf3336c4f8c549a497e  SCRATCH_MNT/test-139/file1
+dc802351f6717547cbf4c951b294f952  SCRATCH_MNT/test-139/file2
 Check scratch fs
-- 
2.1.4

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 2/4] xfstests: require dedup ioctl support in 182

[Christoph Hellwig]

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 tests/generic/182 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/generic/182 b/tests/generic/182
index bf5cd38..eb80b43 100755
--- a/tests/generic/182
+++ b/tests/generic/182
@@ -46,6 +46,7 @@ _cleanup()
 # real QA test starts here
 _supported_os Linux
 _require_test_reflink
+_require_test_dedupe
 _require_cp_reflink
 
 rm -f "$seqres.full"
-- 
2.1.4

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 3/4] xfstests: also treat EINVAL as reflink/dedup not supported

[Christoph Hellwig]

This can be returned by various implementations of the ioctl.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 common/reflink | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/common/reflink b/common/reflink
index de8e56d..8638aba 100644
--- a/common/reflink
+++ b/common/reflink
@@ -92,6 +92,8 @@ _require_test_dedupe()
 		_notrun "Dedupe not supported by test filesystem type: $FSTYP"
 	echo $testio | grep -q "Inappropriate ioctl for device" && \
 		_notrun "Dedupe not supported by test filesystem type: $FSTYP"
+	echo $testio | grep -q "Invalid argument" && \
+		_notrun "Dedupe not supported by test filesystem type: $FSTYP"
 	rm -rf "$TEST_DIR/file1" "$TEST_DIR/file2"
 }
 
@@ -110,6 +112,8 @@ _require_scratch_dedupe()
 		_notrun "Dedupe not supported by test filesystem type: $FSTYP"
 	echo $testio | grep -q "Inappropriate ioctl for device" && \
 		_notrun "Dedupe not supported by test filesystem type: $FSTYP"
+	echo $testio | grep -q "Invalid argument" && \
+		_notrun "Dedupe not supported by test filesystem type: $FSTYP"
 	_scratch_unmount
 }
 
-- 
2.1.4

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 4/4] xfstests: change to relative margins for reflinks tests

[Christoph Hellwig]

NFS uses 32K blocks and thus the numbers used for sanity checking
various reflink operations are way off.  Change to relative margings
and increase them a bit to make NFS happy.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 tests/generic/150 | 2 +-
 tests/generic/151 | 2 +-
 tests/generic/152 | 2 +-
 tests/generic/153 | 2 +-
 tests/generic/154 | 2 +-
 tests/generic/155 | 2 +-
 tests/generic/156 | 2 +-
 tests/generic/157 | 2 +-
 tests/generic/158 | 2 +-
 tests/generic/159 | 2 +-
 tests/generic/160 | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/generic/150 b/tests/generic/150
index f3a6311..90ac46b 100755
--- a/tests/generic/150
+++ b/tests/generic/150
@@ -57,7 +57,7 @@ mkdir "$testdir"
 echo "Create the original file blocks"
 blksz="$(stat -f $testdir -c '%S')"
 blks=2000
-margin=100
+margin='15%'
 sz=$((blksz * blks))
 nr=7
 _pwrite_byte 0x61 0 $sz "$testdir/file1" >> "$seqres.full"
diff --git a/tests/generic/151 b/tests/generic/151
index 286b9ec..c67a12c 100755
--- a/tests/generic/151
+++ b/tests/generic/151
@@ -61,7 +61,7 @@ mkdir "$testdir"
 echo "Create the original file blocks"
 blksz="$(stat -f "$testdir" -c '%S')"
 blks=2000
-margin=100
+margin='15%'
 sz=$((blksz * blks))
 free_blocks0=$(stat -f "$testdir" -c '%f')
 nr=7
diff --git a/tests/generic/152 b/tests/generic/152
index 506a754..cdb2bf9 100755
--- a/tests/generic/152
+++ b/tests/generic/152
@@ -62,7 +62,7 @@ mkdir "$testdir"
 echo "Create the original file blocks"
 blksz="$(stat -f "$testdir" -c '%S')"
 blks=2000
-margin=100
+margin='15%'
 sz=$((blksz * blks))
 free_blocks0=$(stat -f "$testdir" -c '%f')
 nr=4
diff --git a/tests/generic/153 b/tests/generic/153
index 011879e..b2f4022 100755
--- a/tests/generic/153
+++ b/tests/generic/153
@@ -62,7 +62,7 @@ mkdir "$testdir"
 echo "Create the original file blocks"
 blksz="$(stat -f "$testdir" -c '%S')"
 blks=2000
-margin=100
+margin='15%'
 sz=$((blksz * blks))
 free_blocks0=$(stat -f "$testdir" -c '%f')
 nr=4
diff --git a/tests/generic/154 b/tests/generic/154
index 474c578..579f78b 100755
--- a/tests/generic/154
+++ b/tests/generic/154
@@ -61,7 +61,7 @@ mkdir "$testdir"
 echo "Create the original file blocks"
 blksz="$(stat -f "$testdir" -c '%S')"
 blks=2000
-margin=100
+margin='15%'
 free_blocks0=$(stat -f "$testdir" -c '%f')
 nr=4
 sz=$((blks * blksz))
diff --git a/tests/generic/155 b/tests/generic/155
index 611cf1a..56d2912 100755
--- a/tests/generic/155
+++ b/tests/generic/155
@@ -65,7 +65,7 @@ mkdir $testdir
 echo "Create the original file blocks"
 blksz="$(stat -f "$testdir" -c '%S')"
 blks=2000
-margin=100
+margin='15%'
 sz=$((blksz * blks))
 free_blocks0=$(stat -f "$testdir" -c '%f')
 nr=4
diff --git a/tests/generic/156 b/tests/generic/156
index 7194e87..9fea988 100755
--- a/tests/generic/156
+++ b/tests/generic/156
@@ -73,7 +73,7 @@ mkdir "$testdir"
 echo "Create the original file blocks"
 blksz="$(stat -f "$testdir" -c '%S')"
 blks=2000
-margin=100
+margin='15%'
 sz=$((blksz * blks))
 free_blocks0=$(stat -f "$testdir" -c '%f')
 nr=4
diff --git a/tests/generic/157 b/tests/generic/157
index a5b84fc..0150866 100755
--- a/tests/generic/157
+++ b/tests/generic/157
@@ -63,7 +63,7 @@ mkdir "$testdir2"
 echo "Create the original files"
 blksz="$(stat -f $testdir1 -c '%S')"
 blks=1000
-margin=50
+margin='7%'
 sz=$((blksz * blks))
 free_blocks0=$(stat -f $testdir1 -c '%f')
 nr=4
diff --git a/tests/generic/158 b/tests/generic/158
index 58b7090..807c247 100755
--- a/tests/generic/158
+++ b/tests/generic/158
@@ -63,7 +63,7 @@ mkdir "$testdir2"
 echo "Create the original files"
 blksz="$(stat -f $testdir1 -c '%S')"
 blks=1000
-margin=50
+margin='7%'
 sz=$((blksz * blks))
 free_blocks0=$(stat -f $testdir1 -c '%f')
 nr=4
diff --git a/tests/generic/159 b/tests/generic/159
index 14baf64..88a0c7e 100755
--- a/tests/generic/159
+++ b/tests/generic/159
@@ -56,7 +56,7 @@ mkdir "$testdir1"
 echo "Create the original files"
 blksz="$(stat -f $testdir1 -c '%S')"
 blks=1000
-margin=50
+margin='7%'
 sz=$((blksz * blks))
 free_blocks0=$(stat -f $testdir1 -c '%f')
 nr=4
diff --git a/tests/generic/160 b/tests/generic/160
index acd2c4e..83325d5 100755
--- a/tests/generic/160
+++ b/tests/generic/160
@@ -56,7 +56,7 @@ mkdir "$testdir1"
 echo "Create the original files"
 blksz="$(stat -f $testdir1 -c '%S')"
 blks=1000
-margin=50
+margin='7%'
 sz=$((blksz * blks))
 free_blocks0=$(stat -f $testdir1 -c '%f')
 nr=4
-- 
2.1.4

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 1/4] xfstests: fix scratch device filtering in 139

[Darrick J. Wong]

On Thu, Jan 28, 2016 at 06:13:53PM +0100, Christoph Hellwig wrote:
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  tests/xfs/139     | 4 ++--
>  tests/xfs/139.out | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
>  mode change 100644 => 100755 tests/xfs/139
> 
> diff --git a/tests/xfs/139 b/tests/xfs/139
> old mode 100644
> new mode 100755
> index 7400cf8..51c903e
> --- a/tests/xfs/139
> +++ b/tests/xfs/139
> @@ -69,8 +69,8 @@ _pwrite_byte 0x62 0 $sz "$testdir/file1" >> "$seqres.full"
>  _scratch_remount
>  
>  echo "Compare files"
> -md5sum "$testdir/file1" | _filter_test_dir
> -md5sum "$testdir/file2" | _filter_test_dir
> +md5sum "$testdir/file1" | _filter_scratch
> +md5sum "$testdir/file2" | _filter_scratch

This is fixed upstream.

Well, the filtering was fixed and the test now runs on the test device
and leaves scratchdev alone. :)

--D

>  #filefrag -v "$testdir/file1" "$testdir/file2"
>  
>  echo "Check scratch fs"
> diff --git a/tests/xfs/139.out b/tests/xfs/139.out
> index 729e2d6..090e3af 100644
> --- a/tests/xfs/139.out
> +++ b/tests/xfs/139.out
> @@ -3,6 +3,6 @@ Format and mount
>  Create the original files
>  CoW every other block
>  Compare files
> -673c759fb131ccf3336c4f8c549a497e  /opt/test-139/file1
> -dc802351f6717547cbf4c951b294f952  /opt/test-139/file2
> +673c759fb131ccf3336c4f8c549a497e  SCRATCH_MNT/test-139/file1
> +dc802351f6717547cbf4c951b294f952  SCRATCH_MNT/test-139/file2
>  Check scratch fs
> -- 
> 2.1.4
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 2/4] xfstests: require dedup ioctl support in 182

[Darrick J. Wong]

On Thu, Jan 28, 2016 at 06:13:54PM +0100, Christoph Hellwig wrote:
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  tests/generic/182 | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/tests/generic/182 b/tests/generic/182
> index bf5cd38..eb80b43 100755
> --- a/tests/generic/182
> +++ b/tests/generic/182
> @@ -46,6 +46,7 @@ _cleanup()
>  # real QA test starts here
>  _supported_os Linux
>  _require_test_reflink
> +_require_test_dedupe
>  _require_cp_reflink

The _require_*_reflink bits are unnecessary.  I must've been going too fast
when I wrote 181/182; I'll fix that in my repo and send patches.

Also 182's comments should s/reflink/dedupe/.

--D

>  
>  rm -f "$seqres.full"
> -- 
> 2.1.4
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 3/4] xfstests: also treat EINVAL as reflink/dedup not supported

[Darrick J. Wong]

On Thu, Jan 28, 2016 at 06:13:55PM +0100, Christoph Hellwig wrote:
> This can be returned by various implementations of the ioctl.

Looks reasonable, so
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  common/reflink | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/common/reflink b/common/reflink
> index de8e56d..8638aba 100644
> --- a/common/reflink
> +++ b/common/reflink
> @@ -92,6 +92,8 @@ _require_test_dedupe()
>  		_notrun "Dedupe not supported by test filesystem type: $FSTYP"
>  	echo $testio | grep -q "Inappropriate ioctl for device" && \
>  		_notrun "Dedupe not supported by test filesystem type: $FSTYP"
> +	echo $testio | grep -q "Invalid argument" && \
> +		_notrun "Dedupe not supported by test filesystem type: $FSTYP"
>  	rm -rf "$TEST_DIR/file1" "$TEST_DIR/file2"
>  }
>  
> @@ -110,6 +112,8 @@ _require_scratch_dedupe()
>  		_notrun "Dedupe not supported by test filesystem type: $FSTYP"
>  	echo $testio | grep -q "Inappropriate ioctl for device" && \
>  		_notrun "Dedupe not supported by test filesystem type: $FSTYP"
> +	echo $testio | grep -q "Invalid argument" && \
> +		_notrun "Dedupe not supported by test filesystem type: $FSTYP"
>  	_scratch_unmount
>  }
>  
> -- 
> 2.1.4
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 1/4] xfstests: fix scratch device filtering in 139

[Darrick J. Wong]

On Thu, Jan 28, 2016 at 11:24:46AM -0800, Darrick J. Wong wrote:
> On Thu, Jan 28, 2016 at 06:13:53PM +0100, Christoph Hellwig wrote:
> > Signed-off-by: Christoph Hellwig <hch@lst.de>
> > ---
> >  tests/xfs/139     | 4 ++--
> >  tests/xfs/139.out | 4 ++--
> >  2 files changed, 4 insertions(+), 4 deletions(-)
> >  mode change 100644 => 100755 tests/xfs/139
> > 
> > diff --git a/tests/xfs/139 b/tests/xfs/139
> > old mode 100644
> > new mode 100755
> > index 7400cf8..51c903e
> > --- a/tests/xfs/139
> > +++ b/tests/xfs/139

DOH             ^^^

/me grabs another cup of coffee, tries again.

This patch is fine, ignore my earlier statements.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> > @@ -69,8 +69,8 @@ _pwrite_byte 0x62 0 $sz "$testdir/file1" >> "$seqres.full"
> >  _scratch_remount
> >  
> >  echo "Compare files"
> > -md5sum "$testdir/file1" | _filter_test_dir
> > -md5sum "$testdir/file2" | _filter_test_dir
> > +md5sum "$testdir/file1" | _filter_scratch
> > +md5sum "$testdir/file2" | _filter_scratch
> 
> This is fixed upstream.
> 
> Well, the filtering was fixed and the test now runs on the test device
> and leaves scratchdev alone. :)
> 
> --D
> 
> >  #filefrag -v "$testdir/file1" "$testdir/file2"
> >  
> >  echo "Check scratch fs"
> > diff --git a/tests/xfs/139.out b/tests/xfs/139.out
> > index 729e2d6..090e3af 100644
> > --- a/tests/xfs/139.out
> > +++ b/tests/xfs/139.out
> > @@ -3,6 +3,6 @@ Format and mount
> >  Create the original files
> >  CoW every other block
> >  Compare files
> > -673c759fb131ccf3336c4f8c549a497e  /opt/test-139/file1
> > -dc802351f6717547cbf4c951b294f952  /opt/test-139/file2
> > +673c759fb131ccf3336c4f8c549a497e  SCRATCH_MNT/test-139/file1
> > +dc802351f6717547cbf4c951b294f952  SCRATCH_MNT/test-139/file2
> >  Check scratch fs
> > -- 
> > 2.1.4
> > 
> > _______________________________________________
> > xfs mailing list
> > xfs@oss.sgi.com
> > http://oss.sgi.com/mailman/listinfo/xfs
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: a couple xfstests fixes for reflinks

[Darrick J. Wong]

On Thu, Jan 28, 2016 at 06:13:52PM +0100, Christoph Hellwig wrote:
> See http://www.infradead.org/rpr.html

Hrmm, have I been sending junk again?  I've noticed a few transient problems
with Oracle's mailservers lately...

> The patches (against Darrick's for-dave branch) fix various failures I see
> during testing XFS and NFS.

I've integrated your fixes with my dev tree and pushed to github.

There's a bunch of new tests in there to look at quota behaviors.  Evidently
btrfs doesn't support classic usr/group quotas(?) and ocfs2 exploded when I
tried it, so for now I'll just charge each quota at reflink time; copy on write
is therefore "free".

--D

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs