diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2016-08-25 16:28:38 -0700 |
|---|---|---|
| committer | Eryu Guan <eguan@redhat.com> | 2016-09-02 16:40:33 +0800 |
| commit | acede2049ad0ca2d5726460317abea72b1aff223 (patch) | |
| tree | d8f498ab5da68734a6cad73fb5143c672ef57634 | |
| parent | 5bcb0b7d8ce3923aa5b7a2b03e90bda0e452faa8 (diff) | |
| download | xfstests-dev-acede2049ad0ca2d5726460317abea72b1aff223.tar.gz | |
xfs/130,235: deal with an unreplayable dirty log
Now that we have log replay items, an FS shutdown due to a corrupt
btree results in a log that can't be replayed. The only solution
here is to zap the log when we're fixing the corrupt fs, so do that
here.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
| -rwxr-xr-x | tests/xfs/130 | 3 | ||||
| -rwxr-xr-x | tests/xfs/235 | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/xfs/130 b/tests/xfs/130 index 7d8ea2a49e..554d07894f 100755 --- a/tests/xfs/130 +++ b/tests/xfs/130 @@ -87,7 +87,8 @@ _cp_reflink "${SCRATCH_MNT}/file1" "${SCRATCH_MNT}/file4" 2> /dev/null && \ umount "${SCRATCH_MNT}" echo "+ repair fs" -_scratch_xfs_repair >> "$seqres.full" 2>&1 +_disable_dmesg_check +_repair_scratch_fs >> "$seqres.full" 2>&1 _scratch_xfs_repair >> "$seqres.full" 2>&1 echo "+ mount image (2)" diff --git a/tests/xfs/235 b/tests/xfs/235 index c2e03401d7..ef51d226bc 100755 --- a/tests/xfs/235 +++ b/tests/xfs/235 @@ -85,7 +85,8 @@ test -s ${SCRATCH_MNT}/file4 && _fail "should not be able to copy with busted rm umount ${SCRATCH_MNT} echo "+ repair fs" -_scratch_xfs_repair >> $seqres.full 2>&1 +_disable_dmesg_check +_repair_scratch_fs >> "$seqres.full" 2>&1 _scratch_xfs_repair >> $seqres.full 2>&1 echo "+ mount image (2)" |