mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
dump: _cleanup_dump should only check the scratch fs if the test required it
_cleanup_dump always tries to check the scratch fs, even if the caller didn't actually _require_scratch. If a previous test wrote garbage to the scratch device then the dump test will fail here when repair stumbles over the garbage. This was observed by running xfs/016 and xfs/036 in succession. xfs/016 writes 0xc6 to the scratch device and tries to format a small log. If the log is too small the format fails and the test will _notrun. The subsequent xfs/036 will _notrun and then _cleanup_dump if no tape device is set, at which point we try to check the scratch device and logprint aborts due to the abnormal log size (0xc6c6c6c6). Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Allison Collins <allison.henderson@oracle.com> Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
committed by
Eryu Guan
parent
de36c063fc
commit
03a2da5879
+1
-1
@@ -250,7 +250,7 @@ _cleanup_dump()
|
||||
mv $dir.$seq $dir
|
||||
done
|
||||
|
||||
if [ $status -ne $NOTRUNSTS ]; then
|
||||
if [ -f ${RESULT_DIR}/require_scratch ] && [ $status -ne $NOTRUNSTS ]; then
|
||||
# Sleep added to stop _check_scratch_fs from complaining that the
|
||||
# scratch_dev is still busy
|
||||
sleep 10
|
||||
|
||||
Reference in New Issue
Block a user