[Top] [All Lists]

[PATCH 2/2] repair: handle uncorrected corruptions in phase 2

To: xfs@xxxxxxxxxxx
Subject: [PATCH 2/2] repair: handle uncorrected corruptions in phase 2
From: Dave Chinner <david@xxxxxxxxxxxxx>
Date: Wed, 9 Jul 2014 09:41:40 +1000
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1404862900-3369-1-git-send-email-david@xxxxxxxxxxxxx>
References: <1404862900-3369-1-git-send-email-david@xxxxxxxxxxxxx>
From: Dave Chinner <dchinner@xxxxxxxxxx>

Some of the AG header corruptions detected by the IO verifiers
cannot be corrected in phase 2 when we do the initial scan of the
AGs. Correcting some errors cannot be done until a full rebuild of
the trees is done in phase 5.

Hence we can end up with a "clean" AGF/AGI buffer but have a
EFSCORRUPTED error on the buffer. This results in an assert failing:

        ASSERT(agf_dirty || agfbuf->b_error != EFSCORRUPTED);

and repair not beign able to fix the problems it has tripped over.
Hence the assert that we corrected all corruptions in the buffers
is not valid and should be removed.

Reported-by: Hans Kraus <hans.w.kraus@xxxxxx>
Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
 repair/scan.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/repair/scan.c b/repair/scan.c
index f29ff8d..142d8d7 100644
--- a/repair/scan.c
+++ b/repair/scan.c
@@ -1572,14 +1572,13 @@ scan_ag(
         * Only pay attention to CRC/verifier errors if we can correct them.
-        * While there, ensure that we corrected a corruption error if the
-        * verifier detected one.
+        * Note that we can get uncorrected EFSCORRUPTED errors here because
+        * the verifier will flag on out of range values that we can't correct
+        * until phase 5 when we have all the information necessary to rebuild
+        * the freespace/inode btrees. We can correct bad CRC errors
+        * immediately, though.
        if (!no_modify) {
-               ASSERT(agi_dirty || agibuf->b_error != EFSCORRUPTED);
-               ASSERT(agf_dirty || agfbuf->b_error != EFSCORRUPTED);
-               ASSERT(sb_dirty || sbbuf->b_error != EFSCORRUPTED);
                agi_dirty += (agibuf->b_error == EFSBADCRC);
                agf_dirty += (agfbuf->b_error == EFSBADCRC);
                sb_dirty += (sbbuf->b_error == EFSBADCRC);

<Prev in Thread] Current Thread [Next in Thread>