mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
fstests: fix various $seqres.full issues
There're many tests don't remove $seqres.full before writing to it, and accumulating logs there, then the logs are always growing over time. Let's fix them once. generic/16[1-8] generic/170 and generic/33[34] truncate $seqres.full in the middle of the test, which results in partial logs. Fix them as well. xfs/227 has duplicated lines to remove $seqres.full, remove the extra line. Signed-off-by: Eryu Guan <eguan@redhat.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
@@ -108,6 +108,7 @@ _workout()
|
|||||||
|
|
||||||
_require_fio $fio_config
|
_require_fio $fio_config
|
||||||
|
|
||||||
|
rm -f $seqres.full
|
||||||
_scratch_mkfs >> $seqres.full 2>&1
|
_scratch_mkfs >> $seqres.full 2>&1
|
||||||
_scratch_mount
|
_scratch_mount
|
||||||
|
|
||||||
|
|||||||
@@ -126,6 +126,7 @@ _workout()
|
|||||||
|
|
||||||
_require_fio $fio_config
|
_require_fio $fio_config
|
||||||
|
|
||||||
|
rm -f $seqres.full
|
||||||
_scratch_mkfs >> $seqres.full 2>&1
|
_scratch_mkfs >> $seqres.full 2>&1
|
||||||
_scratch_mount
|
_scratch_mount
|
||||||
|
|
||||||
|
|||||||
@@ -136,6 +136,7 @@ _workout()
|
|||||||
|
|
||||||
_require_fio $fio_config
|
_require_fio $fio_config
|
||||||
|
|
||||||
|
rm -f $seqres.full
|
||||||
_scratch_mkfs >> $seqres.full 2>&1
|
_scratch_mkfs >> $seqres.full 2>&1
|
||||||
_scratch_mount
|
_scratch_mount
|
||||||
|
|
||||||
|
|||||||
@@ -113,6 +113,7 @@ _workout()
|
|||||||
|
|
||||||
_require_fio $fio_config
|
_require_fio $fio_config
|
||||||
|
|
||||||
|
rm -f $seqres.full
|
||||||
_scratch_mkfs >> $seqres.full 2>&1
|
_scratch_mkfs >> $seqres.full 2>&1
|
||||||
_scratch_mount
|
_scratch_mount
|
||||||
|
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ _require_scratch
|
|||||||
_require_defrag
|
_require_defrag
|
||||||
_require_xfs_io_command "falloc"
|
_require_xfs_io_command "falloc"
|
||||||
|
|
||||||
|
rm -f $seqres.full
|
||||||
_scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seqres.full 2>&1
|
_scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seqres.full 2>&1
|
||||||
_scratch_mount
|
_scratch_mount
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -58,7 +58,7 @@ loops=4096
|
|||||||
blksz=65536
|
blksz=65536
|
||||||
|
|
||||||
echo "Initialize files"
|
echo "Initialize files"
|
||||||
echo > $seqres.full
|
echo >> $seqres.full
|
||||||
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file1 >> $seqres.full
|
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file1 >> $seqres.full
|
||||||
_cp_reflink $testdir/file1 $testdir/file2
|
_cp_reflink $testdir/file1 $testdir/file2
|
||||||
_scratch_cycle_mount
|
_scratch_cycle_mount
|
||||||
|
|||||||
+1
-1
@@ -58,7 +58,7 @@ nr_loops=$((loops - 1))
|
|||||||
blksz=65536
|
blksz=65536
|
||||||
|
|
||||||
echo "Initialize files"
|
echo "Initialize files"
|
||||||
echo > $seqres.full
|
echo >> $seqres.full
|
||||||
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file1 >> $seqres.full
|
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file1 >> $seqres.full
|
||||||
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file2 >> $seqres.full
|
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file2 >> $seqres.full
|
||||||
_scratch_cycle_mount
|
_scratch_cycle_mount
|
||||||
|
|||||||
+1
-1
@@ -58,7 +58,7 @@ nr_loops=$((loops - 1))
|
|||||||
blksz=65536
|
blksz=65536
|
||||||
|
|
||||||
echo "Initialize files"
|
echo "Initialize files"
|
||||||
echo > $seqres.full
|
echo >> $seqres.full
|
||||||
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file1 >> $seqres.full
|
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file1 >> $seqres.full
|
||||||
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file2 >> $seqres.full
|
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file2 >> $seqres.full
|
||||||
_scratch_cycle_mount
|
_scratch_cycle_mount
|
||||||
|
|||||||
+1
-1
@@ -60,7 +60,7 @@ nr_loops=$((loops - 1))
|
|||||||
blksz=65536
|
blksz=65536
|
||||||
|
|
||||||
echo "Initialize files"
|
echo "Initialize files"
|
||||||
echo > $seqres.full
|
echo >> $seqres.full
|
||||||
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file1 >> $seqres.full
|
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file1 >> $seqres.full
|
||||||
_pwrite_byte 0x62 0 $((loops * blksz)) $testdir/file2 >> $seqres.full
|
_pwrite_byte 0x62 0 $((loops * blksz)) $testdir/file2 >> $seqres.full
|
||||||
_cp_reflink $testdir/file1 $testdir/file3
|
_cp_reflink $testdir/file1 $testdir/file3
|
||||||
|
|||||||
+1
-1
@@ -61,7 +61,7 @@ nr_loops=$((loops - 1))
|
|||||||
blksz=65536
|
blksz=65536
|
||||||
|
|
||||||
echo "Initialize files"
|
echo "Initialize files"
|
||||||
echo > $seqres.full
|
echo >> $seqres.full
|
||||||
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file1 >> $seqres.full
|
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file1 >> $seqres.full
|
||||||
_pwrite_byte 0x62 0 $((loops * blksz)) $testdir/file2 >> $seqres.full
|
_pwrite_byte 0x62 0 $((loops * blksz)) $testdir/file2 >> $seqres.full
|
||||||
_cp_reflink $testdir/file1 $testdir/file3
|
_cp_reflink $testdir/file1 $testdir/file3
|
||||||
|
|||||||
+1
-1
@@ -61,7 +61,7 @@ nr_loops=$((loops - 1))
|
|||||||
blksz=65536
|
blksz=65536
|
||||||
|
|
||||||
echo "Initialize file"
|
echo "Initialize file"
|
||||||
echo > $seqres.full
|
echo >> $seqres.full
|
||||||
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file1 >> $seqres.full
|
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file1 >> $seqres.full
|
||||||
_scratch_cycle_mount
|
_scratch_cycle_mount
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -60,7 +60,7 @@ nr_loops=$((loops - 1))
|
|||||||
blksz=65536
|
blksz=65536
|
||||||
|
|
||||||
echo "Initialize file"
|
echo "Initialize file"
|
||||||
echo > $seqres.full
|
echo >> $seqres.full
|
||||||
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file1 >> $seqres.full
|
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file1 >> $seqres.full
|
||||||
_scratch_cycle_mount
|
_scratch_cycle_mount
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -59,7 +59,7 @@ nr_loops=$((loops - 1))
|
|||||||
blksz=65536
|
blksz=65536
|
||||||
|
|
||||||
echo "Initialize files"
|
echo "Initialize files"
|
||||||
echo > $seqres.full
|
echo >> $seqres.full
|
||||||
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file1 >> $seqres.full
|
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file1 >> $seqres.full
|
||||||
_pwrite_byte 0x62 0 $((loops * blksz)) $testdir/file2 >> $seqres.full
|
_pwrite_byte 0x62 0 $((loops * blksz)) $testdir/file2 >> $seqres.full
|
||||||
_scratch_cycle_mount
|
_scratch_cycle_mount
|
||||||
|
|||||||
+1
-1
@@ -60,7 +60,7 @@ nr_loops=$((loops - 1))
|
|||||||
blksz=65536
|
blksz=65536
|
||||||
|
|
||||||
echo "Initialize files"
|
echo "Initialize files"
|
||||||
echo > $seqres.full
|
echo >> $seqres.full
|
||||||
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file1 >> $seqres.full
|
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file1 >> $seqres.full
|
||||||
_pwrite_byte 0x62 0 $((loops * blksz)) $testdir/file2 >> $seqres.full
|
_pwrite_byte 0x62 0 $((loops * blksz)) $testdir/file2 >> $seqres.full
|
||||||
_scratch_cycle_mount
|
_scratch_cycle_mount
|
||||||
|
|||||||
@@ -70,6 +70,7 @@ _require_scratch
|
|||||||
_require_quota
|
_require_quota
|
||||||
_require_user
|
_require_user
|
||||||
|
|
||||||
|
rm -f $seqres.full
|
||||||
_scratch_mkfs >> $seqres.full 2>&1
|
_scratch_mkfs >> $seqres.full 2>&1
|
||||||
_scratch_mount "-o usrquota,grpquota"
|
_scratch_mount "-o usrquota,grpquota"
|
||||||
chmod 777 $SCRATCH_MNT
|
chmod 777 $SCRATCH_MNT
|
||||||
|
|||||||
+1
-1
@@ -61,7 +61,7 @@ nr_loops=$((loops - 1))
|
|||||||
blksz=65536
|
blksz=65536
|
||||||
|
|
||||||
echo "Initialize file"
|
echo "Initialize file"
|
||||||
echo > $seqres.full
|
echo >> $seqres.full
|
||||||
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file1 >> $seqres.full
|
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file1 >> $seqres.full
|
||||||
_scratch_cycle_mount
|
_scratch_cycle_mount
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -60,7 +60,7 @@ nr_loops=$((loops - 1))
|
|||||||
blksz=65536
|
blksz=65536
|
||||||
|
|
||||||
echo "Initialize file"
|
echo "Initialize file"
|
||||||
echo > $seqres.full
|
echo >> $seqres.full
|
||||||
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file1 >> $seqres.full
|
_pwrite_byte 0x61 0 $((loops * blksz)) $testdir/file1 >> $seqres.full
|
||||||
_scratch_cycle_mount
|
_scratch_cycle_mount
|
||||||
|
|
||||||
|
|||||||
@@ -71,6 +71,8 @@ _stress_scratch()
|
|||||||
# real QA test starts here
|
# real QA test starts here
|
||||||
_supported_fs xfs
|
_supported_fs xfs
|
||||||
_require_scratch
|
_require_scratch
|
||||||
|
|
||||||
|
rm -f $seqres.full
|
||||||
_scratch_mkfs_xfs | tee -a $seqres.full | _filter_mkfs 2>$tmp.mkfs
|
_scratch_mkfs_xfs | tee -a $seqres.full | _filter_mkfs 2>$tmp.mkfs
|
||||||
. $tmp.mkfs # extract blocksize and data size for scratch device
|
. $tmp.mkfs # extract blocksize and data size for scratch device
|
||||||
|
|
||||||
|
|||||||
@@ -93,6 +93,7 @@ allocate()
|
|||||||
# real QA test starts here
|
# real QA test starts here
|
||||||
_scratch_unmount 2>/dev/null
|
_scratch_unmount 2>/dev/null
|
||||||
_scratch_mount
|
_scratch_mount
|
||||||
|
rm -f $seqres.full
|
||||||
|
|
||||||
# see if faststart is possible (and requested)
|
# see if faststart is possible (and requested)
|
||||||
files=2000
|
files=2000
|
||||||
|
|||||||
@@ -41,6 +41,8 @@ _supported_fs xfs
|
|||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
_require_command "$INDENT_PROG" indent
|
_require_command "$INDENT_PROG" indent
|
||||||
|
|
||||||
|
rm -f $seqres.full
|
||||||
|
|
||||||
# filter out known changes to xfs type sizes
|
# filter out known changes to xfs type sizes
|
||||||
_type_size_filter()
|
_type_size_filter()
|
||||||
{
|
{
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user