Skip to contentSkip to conversation

tests/generic/54{0..3}: redirect FILEFRAG error output to .full too

PATCH In review Murphy Zhou 3 participants 3 messages May 20, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/generic/54{0..3}: redirect FILEFRAG error output to .full too

NFSv4.2 supports reflink but does not support FIBMAP. These 4 tests about file content can pass on NFSv4.2, but FILEFRAG complaint :
+/mnt/testarea/scratch/test-542/file2: FIBMAP unsupported is breaking golden output.

---
 tests/generic/540 | 8 ++++----
 tests/generic/541 | 8 ++++----
 tests/generic/542 | 8 ++++----
 tests/generic/543 | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)
tests/generic/540 +4 -4
index 65a71f22..dc4d9485 100755
@@ -72,16 +72,16 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
 
 # now reflink into the rainbow
 echo "before reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
 $XFS_IO_PROG -f -c "reflink $testdir/file2 $roff $roff $rsz" $testdir/file3 >> $seqres.full
 _pwrite_byte 0x64 $roff $rsz $testdir/file3.chk >> $seqres.full
 _scratch_cycle_mount
 
 echo "Compare files"
 echo "after reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
 md5sum $testdir/file1 | _filter_scratch
 md5sum $testdir/file2 | _filter_scratch
 md5sum $testdir/file3 | _filter_scratch
tests/generic/541 +4 -4
index e7e19be4..fcb5d567 100755
@@ -74,8 +74,8 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
 
 # now reflink the rainbow
 echo "before reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
 $XFS_IO_PROG -f -c "reflink $testdir/file3 $roff $roff $rsz" $testdir/file2 >> $seqres.full
 cp $testdir/file3.chk $testdir/file2.chk
 _pwrite_byte 0x64 0 $roff $testdir/file2.chk >> $seqres.full
@@ -84,8 +84,8 @@ _scratch_cycle_mount
 
 echo "Compare files"
 echo "after reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
 md5sum $testdir/file1 | _filter_scratch
 md5sum $testdir/file2 | _filter_scratch
 md5sum $testdir/file2.chk | _filter_scratch
tests/generic/542 +4 -4
index c416ab69..62b32cb5 100755
@@ -73,16 +73,16 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
 
 # now reflink into the rainbow
 echo "before reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
 $XFS_IO_PROG -f -c "reflink $testdir/file2 $soff $doff $rsz" $testdir/file3 >> $seqres.full
 _pwrite_byte 0x64 $doff $rsz $testdir/file3.chk >> $seqres.full
 _scratch_cycle_mount
 
 echo "Compare files"
 echo "after reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
 md5sum $testdir/file1 | _filter_scratch
 md5sum $testdir/file2 | _filter_scratch
 md5sum $testdir/file3 | _filter_scratch
tests/generic/543 +4 -4
index 50a51f89..cc7ee532 100755
@@ -75,8 +75,8 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
 
 # now reflink the rainbow
 echo "before reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
 $XFS_IO_PROG -f -c "reflink $testdir/file3 $soff $doff $rsz" $testdir/file2 >> $seqres.full
 $XFS_IO_PROG -c "truncate $doff" $testdir/file2.chk
 dd if=$testdir/file3.chk skip=$((soff / blksz)) count=$((rsz / blksz)) bs=$blksz >> $testdir/file2.chk 2> /dev/null
@@ -84,8 +84,8 @@ _scratch_cycle_mount
 
 echo "Compare files"
 echo "after reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
 md5sum $testdir/file1 | _filter_scratch
 md5sum $testdir/file2 | _filter_scratch
 md5sum $testdir/file2.chk | _filter_scratch
Signature · 1 line
2.21.0
#1 lore raw
Quoted 110 lines · Murphy Zhou

NFSv4.2 supports reflink but does not support FIBMAP. These 4 tests about file content can pass on NFSv4.2, but FILEFRAG complaint :
+/mnt/testarea/scratch/test-542/file2: FIBMAP unsupported is breaking golden output.

---

tests/generic/540 | 8 ++++----
tests/generic/541 | 8 ++++----
tests/generic/542 | 8 ++++----
tests/generic/543 | 8 ++++----
4 files changed, 16 insertions(+), 16 deletions(-)
tests/generic/540 +0 -0
index 65a71f22..dc4d9485 100755
@@ -72,16 +72,16 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
 
 # now reflink into the rainbow

echo "before reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
$XFS_IO_PROG -f -c "reflink $testdir/file2 $roff $roff $rsz" $testdir/file3 >> $seqres.full _pwrite_byte 0x64 $roff $rsz $testdir/file3.chk >> $seqres.full _scratch_cycle_mount

echo "Compare files"
echo "after reflink" >> $seqres.full -$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full -$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full +$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1 +$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1

md5sum $testdir/file1 | _filter_scratch
md5sum $testdir/file2 | _filter_scratch
md5sum $testdir/file3 | _filter_scratch
tests/generic/541 +0 -0
index e7e19be4..fcb5d567 100755
@@ -74,8 +74,8 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
 
 # now reflink the rainbow

echo "before reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
$XFS_IO_PROG -f -c "reflink $testdir/file3 $roff $roff $rsz" $testdir/file2 >> $seqres.full cp $testdir/file3.chk $testdir/file2.chk
_pwrite_byte 0x64 0 $roff $testdir/file2.chk >> $seqres.full

tests/generic/541 +0 -0
@@ -84,8 +84,8 @@ _scratch_cycle_mount
 

echo "Compare files"
echo "after reflink" >> $seqres.full -$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full -$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full +$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1 +$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1 md5sum $testdir/file1 | _filter_scratch md5sum $testdir/file2 | _filter_scratch md5sum $testdir/file2.chk | _filter_scratch

tests/generic/542 +0 -0
index c416ab69..62b32cb5 100755
@@ -73,16 +73,16 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
 
 # now reflink into the rainbow

echo "before reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
$XFS_IO_PROG -f -c "reflink $testdir/file2 $soff $doff $rsz" $testdir/file3 >> $seqres.full _pwrite_byte 0x64 $doff $rsz $testdir/file3.chk >> $seqres.full _scratch_cycle_mount

echo "Compare files"
echo "after reflink" >> $seqres.full -$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full -$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full +$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1 +$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1

md5sum $testdir/file1 | _filter_scratch
md5sum $testdir/file2 | _filter_scratch
md5sum $testdir/file3 | _filter_scratch
tests/generic/543 +0 -0
index 50a51f89..cc7ee532 100755
@@ -75,8 +75,8 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
 
 # now reflink the rainbow

echo "before reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
$XFS_IO_PROG -f -c "reflink $testdir/file3 $soff $doff $rsz" $testdir/file2 >> $seqres.full $XFS_IO_PROG -c "truncate $doff" $testdir/file2.chk
dd if=$testdir/file3.chk skip=$((soff / blksz)) count=$((rsz / blksz)) bs=$blksz >> $testdir/file2.chk 2> /dev/null

tests/generic/543 +0 -0
@@ -84,8 +84,8 @@ _scratch_cycle_mount
 

echo "Compare files"

Quoted 11 lines

echo "after reflink" >> $seqres.full -$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full -$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full +$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1 +$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1 md5sum $testdir/file1 | _filter_scratch md5sum $testdir/file2 | _filter_scratch md5sum $testdir/file2.chk | _filter_scratch

Signature · 1 line
2.21.0

Hi -

No comment on the content of this patch, but please do cross-post NFS-related fstests fixes to [email protected]. Thank you!

--
Chuck Lever

Reviewed-by on v1 1/1
#2 lore raw
In reply to Murphy Zhou
Quoted 6 lines · Murphy Zhou

NFSv4.2 supports reflink but does not support FIBMAP. These 4 tests about file content can pass on NFSv4.2, but FILEFRAG complaint :
+/mnt/testarea/scratch/test-542/file2: FIBMAP unsupported is breaking golden output.

Looks ok to me,

--D

Quoted 112 lines
---
 tests/generic/540 | 8 ++++----
 tests/generic/541 | 8 ++++----
 tests/generic/542 | 8 ++++----
 tests/generic/543 | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)
tests/generic/540 +4 -4
index 65a71f22..dc4d9485 100755
@@ -72,16 +72,16 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
 
 # now reflink into the rainbow
 echo "before reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
 $XFS_IO_PROG -f -c "reflink $testdir/file2 $roff $roff $rsz" $testdir/file3 >> $seqres.full
 _pwrite_byte 0x64 $roff $rsz $testdir/file3.chk >> $seqres.full
 _scratch_cycle_mount
 
 echo "Compare files"
 echo "after reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
 md5sum $testdir/file1 | _filter_scratch
 md5sum $testdir/file2 | _filter_scratch
 md5sum $testdir/file3 | _filter_scratch
tests/generic/541 +4 -4
index e7e19be4..fcb5d567 100755
@@ -74,8 +74,8 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
 
 # now reflink the rainbow
 echo "before reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
 $XFS_IO_PROG -f -c "reflink $testdir/file3 $roff $roff $rsz" $testdir/file2 >> $seqres.full
 cp $testdir/file3.chk $testdir/file2.chk
 _pwrite_byte 0x64 0 $roff $testdir/file2.chk >> $seqres.full
@@ -84,8 +84,8 @@ _scratch_cycle_mount
 
 echo "Compare files"
 echo "after reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
 md5sum $testdir/file1 | _filter_scratch
 md5sum $testdir/file2 | _filter_scratch
 md5sum $testdir/file2.chk | _filter_scratch
tests/generic/542 +4 -4
index c416ab69..62b32cb5 100755
@@ -73,16 +73,16 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
 
 # now reflink into the rainbow
 echo "before reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
 $XFS_IO_PROG -f -c "reflink $testdir/file2 $soff $doff $rsz" $testdir/file3 >> $seqres.full
 _pwrite_byte 0x64 $doff $rsz $testdir/file3.chk >> $seqres.full
 _scratch_cycle_mount
 
 echo "Compare files"
 echo "after reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
 md5sum $testdir/file1 | _filter_scratch
 md5sum $testdir/file2 | _filter_scratch
 md5sum $testdir/file3 | _filter_scratch
tests/generic/543 +4 -4
index 50a51f89..cc7ee532 100755
@@ -75,8 +75,8 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
 
 # now reflink the rainbow
 echo "before reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
 $XFS_IO_PROG -f -c "reflink $testdir/file3 $soff $doff $rsz" $testdir/file2 >> $seqres.full
 $XFS_IO_PROG -c "truncate $doff" $testdir/file2.chk
 dd if=$testdir/file3.chk skip=$((soff / blksz)) count=$((rsz / blksz)) bs=$blksz >> $testdir/file2.chk 2> /dev/null
@@ -84,8 +84,8 @@ _scratch_cycle_mount
 
 echo "Compare files"
 echo "after reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
 md5sum $testdir/file1 | _filter_scratch
 md5sum $testdir/file2 | _filter_scratch
 md5sum $testdir/file2.chk | _filter_scratch
Signature · 1 line
2.21.0