generic/018: use xfs_io and larger buffers for writes

The test currently uses 'dd' directly for writing to files; instead
we should be using the xfs_io pwrite command.

Also, when we have a configuration that does not do delayed
allocation (e.g. dax), there is no guarantee that the files will be
allocated in the pattern expected, so do all the writes from a
single buffer so the kernel can allocate extents in the manner the
test expects as much as possible.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Dave Chinner
2015-05-26 12:50:53 +10:00
committed by Dave Chinner
parent 35a192a3a9
commit 81d9c7039a
+12 -7
View File
@@ -57,6 +57,7 @@ fragfile=$SCRATCH_MNT/fragfile.$$
rm -f $fragfile rm -f $fragfile
# Craft some fragmented files, defrag them, check the result. # Craft some fragmented files, defrag them, check the result.
bsize=4096
echo "zero-length file:" | tee -a $seqres.full echo "zero-length file:" | tee -a $seqres.full
touch $fragfile touch $fragfile
@@ -67,24 +68,28 @@ $XFS_IO_PROG -f -c "truncate 1m" $fragfile
_defrag --before 0 --after 0 $fragfile _defrag --before 0 --after 0 $fragfile
echo "Contiguous file:" | tee -a $seqres.full echo "Contiguous file:" | tee -a $seqres.full
dd if=/dev/zero of=$fragfile bs=4k count=4 &>/dev/null $XFS_IO_PROG -f -c "pwrite -b $((4 * bsize)) 0 $((4 * bsize))" $fragfile \
> /dev/null
_defrag --before 1 --after 1 $fragfile _defrag --before 1 --after 1 $fragfile
echo "Write backwards sync, but contiguous - should defrag to 1 extent" | tee -a $seqres.full echo "Write backwards sync, but contiguous - should defrag to 1 extent" | tee -a $seqres.full
for I in `seq 9 -1 0`; do for i in `seq 9 -1 0`; do
dd if=/dev/zero of=$fragfile bs=4k count=1 conv=notrunc seek=$I oflag=sync &>/dev/null $XFS_IO_PROG -fs -c "pwrite -b $bsize $((i * bsize)) $bsize" $fragfile \
> /dev/null
done done
_defrag --before 10 --after 1 $fragfile _defrag --before 10 --after 1 $fragfile
echo "Write backwards sync leaving holes - defrag should do nothing" | tee -a $seqres.full echo "Write backwards sync leaving holes - defrag should do nothing" | tee -a $seqres.full
for I in `seq 31 -2 0`; do for i in `seq 31 -2 0`; do
dd if=/dev/zero of=$fragfile bs=4k count=1 conv=notrunc seek=$I oflag=sync &>/dev/null $XFS_IO_PROG -fs -c "pwrite -b $bsize $((i * bsize)) $bsize" $fragfile \
> /dev/null
done done
_defrag --before 16 --after 16 $fragfile _defrag --before 16 --after 16 $fragfile
echo "Write forwards sync leaving holes - defrag should do nothing" | tee -a $seqres.full echo "Write forwards sync leaving holes - defrag should do nothing" | tee -a $seqres.full
for I in `seq 0 2 31`; do for i in `seq 0 2 31`; do
dd if=/dev/zero of=$fragfile bs=4k count=1 conv=notrunc seek=$I oflag=sync &>/dev/null $XFS_IO_PROG -fs -c "pwrite -b $bsize $((i * bsize)) $bsize" $fragfile \
> /dev/null
done done
_defrag --before 16 --after 16 $fragfile _defrag --before 16 --after 16 $fragfile