mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-24 12:44:11 +08:00
xfs: scrub should only cross-reference with healthy btrees
Skip cross-referencing with a btree if the health report tells us that it's known to be bad. This should reduce the dmesg spew considerably. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Dave Chinner <dchinner@redhat.com>
This commit is contained in:
parent
4860a05d24
commit
4fb7951fde
@ -38,6 +38,7 @@
|
|||||||
#include "scrub/trace.h"
|
#include "scrub/trace.h"
|
||||||
#include "scrub/btree.h"
|
#include "scrub/btree.h"
|
||||||
#include "scrub/repair.h"
|
#include "scrub/repair.h"
|
||||||
|
#include "scrub/health.h"
|
||||||
|
|
||||||
/* Common code for the metadata scrubbers. */
|
/* Common code for the metadata scrubbers. */
|
||||||
|
|
||||||
@ -458,13 +459,18 @@ xchk_ag_btcur_init(
|
|||||||
struct xfs_mount *mp = sc->mp;
|
struct xfs_mount *mp = sc->mp;
|
||||||
xfs_agnumber_t agno = sa->agno;
|
xfs_agnumber_t agno = sa->agno;
|
||||||
|
|
||||||
if (sa->agf_bp) {
|
xchk_perag_get(sc->mp, sa);
|
||||||
|
if (sa->agf_bp &&
|
||||||
|
xchk_ag_btree_healthy_enough(sc, sa->pag, XFS_BTNUM_BNO)) {
|
||||||
/* Set up a bnobt cursor for cross-referencing. */
|
/* Set up a bnobt cursor for cross-referencing. */
|
||||||
sa->bno_cur = xfs_allocbt_init_cursor(mp, sc->tp, sa->agf_bp,
|
sa->bno_cur = xfs_allocbt_init_cursor(mp, sc->tp, sa->agf_bp,
|
||||||
agno, XFS_BTNUM_BNO);
|
agno, XFS_BTNUM_BNO);
|
||||||
if (!sa->bno_cur)
|
if (!sa->bno_cur)
|
||||||
goto err;
|
goto err;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (sa->agf_bp &&
|
||||||
|
xchk_ag_btree_healthy_enough(sc, sa->pag, XFS_BTNUM_CNT)) {
|
||||||
/* Set up a cntbt cursor for cross-referencing. */
|
/* Set up a cntbt cursor for cross-referencing. */
|
||||||
sa->cnt_cur = xfs_allocbt_init_cursor(mp, sc->tp, sa->agf_bp,
|
sa->cnt_cur = xfs_allocbt_init_cursor(mp, sc->tp, sa->agf_bp,
|
||||||
agno, XFS_BTNUM_CNT);
|
agno, XFS_BTNUM_CNT);
|
||||||
@ -473,7 +479,8 @@ xchk_ag_btcur_init(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Set up a inobt cursor for cross-referencing. */
|
/* Set up a inobt cursor for cross-referencing. */
|
||||||
if (sa->agi_bp) {
|
if (sa->agi_bp &&
|
||||||
|
xchk_ag_btree_healthy_enough(sc, sa->pag, XFS_BTNUM_INO)) {
|
||||||
sa->ino_cur = xfs_inobt_init_cursor(mp, sc->tp, sa->agi_bp,
|
sa->ino_cur = xfs_inobt_init_cursor(mp, sc->tp, sa->agi_bp,
|
||||||
agno, XFS_BTNUM_INO);
|
agno, XFS_BTNUM_INO);
|
||||||
if (!sa->ino_cur)
|
if (!sa->ino_cur)
|
||||||
@ -481,7 +488,8 @@ xchk_ag_btcur_init(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Set up a finobt cursor for cross-referencing. */
|
/* Set up a finobt cursor for cross-referencing. */
|
||||||
if (sa->agi_bp && xfs_sb_version_hasfinobt(&mp->m_sb)) {
|
if (sa->agi_bp && xfs_sb_version_hasfinobt(&mp->m_sb) &&
|
||||||
|
xchk_ag_btree_healthy_enough(sc, sa->pag, XFS_BTNUM_FINO)) {
|
||||||
sa->fino_cur = xfs_inobt_init_cursor(mp, sc->tp, sa->agi_bp,
|
sa->fino_cur = xfs_inobt_init_cursor(mp, sc->tp, sa->agi_bp,
|
||||||
agno, XFS_BTNUM_FINO);
|
agno, XFS_BTNUM_FINO);
|
||||||
if (!sa->fino_cur)
|
if (!sa->fino_cur)
|
||||||
@ -489,7 +497,8 @@ xchk_ag_btcur_init(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Set up a rmapbt cursor for cross-referencing. */
|
/* Set up a rmapbt cursor for cross-referencing. */
|
||||||
if (sa->agf_bp && xfs_sb_version_hasrmapbt(&mp->m_sb)) {
|
if (sa->agf_bp && xfs_sb_version_hasrmapbt(&mp->m_sb) &&
|
||||||
|
xchk_ag_btree_healthy_enough(sc, sa->pag, XFS_BTNUM_RMAP)) {
|
||||||
sa->rmap_cur = xfs_rmapbt_init_cursor(mp, sc->tp, sa->agf_bp,
|
sa->rmap_cur = xfs_rmapbt_init_cursor(mp, sc->tp, sa->agf_bp,
|
||||||
agno);
|
agno);
|
||||||
if (!sa->rmap_cur)
|
if (!sa->rmap_cur)
|
||||||
@ -497,7 +506,8 @@ xchk_ag_btcur_init(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Set up a refcountbt cursor for cross-referencing. */
|
/* Set up a refcountbt cursor for cross-referencing. */
|
||||||
if (sa->agf_bp && xfs_sb_version_hasreflink(&mp->m_sb)) {
|
if (sa->agf_bp && xfs_sb_version_hasreflink(&mp->m_sb) &&
|
||||||
|
xchk_ag_btree_healthy_enough(sc, sa->pag, XFS_BTNUM_REFC)) {
|
||||||
sa->refc_cur = xfs_refcountbt_init_cursor(mp, sc->tp,
|
sa->refc_cur = xfs_refcountbt_init_cursor(mp, sc->tp,
|
||||||
sa->agf_bp, agno);
|
sa->agf_bp, agno);
|
||||||
if (!sa->refc_cur)
|
if (!sa->refc_cur)
|
||||||
|
@ -174,3 +174,63 @@ xchk_update_health(
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Is the given per-AG btree healthy enough for scanning? */
|
||||||
|
bool
|
||||||
|
xchk_ag_btree_healthy_enough(
|
||||||
|
struct xfs_scrub *sc,
|
||||||
|
struct xfs_perag *pag,
|
||||||
|
xfs_btnum_t btnum)
|
||||||
|
{
|
||||||
|
unsigned int mask = 0;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* We always want the cursor if it's the same type as whatever we're
|
||||||
|
* scrubbing, even if we already know the structure is corrupt.
|
||||||
|
*
|
||||||
|
* Otherwise, we're only interested in the btree for cross-referencing.
|
||||||
|
* If we know the btree is bad then don't bother, just set XFAIL.
|
||||||
|
*/
|
||||||
|
switch (btnum) {
|
||||||
|
case XFS_BTNUM_BNO:
|
||||||
|
if (sc->sm->sm_type == XFS_SCRUB_TYPE_BNOBT)
|
||||||
|
return true;
|
||||||
|
mask = XFS_SICK_AG_BNOBT;
|
||||||
|
break;
|
||||||
|
case XFS_BTNUM_CNT:
|
||||||
|
if (sc->sm->sm_type == XFS_SCRUB_TYPE_CNTBT)
|
||||||
|
return true;
|
||||||
|
mask = XFS_SICK_AG_CNTBT;
|
||||||
|
break;
|
||||||
|
case XFS_BTNUM_INO:
|
||||||
|
if (sc->sm->sm_type == XFS_SCRUB_TYPE_INOBT)
|
||||||
|
return true;
|
||||||
|
mask = XFS_SICK_AG_INOBT;
|
||||||
|
break;
|
||||||
|
case XFS_BTNUM_FINO:
|
||||||
|
if (sc->sm->sm_type == XFS_SCRUB_TYPE_FINOBT)
|
||||||
|
return true;
|
||||||
|
mask = XFS_SICK_AG_FINOBT;
|
||||||
|
break;
|
||||||
|
case XFS_BTNUM_RMAP:
|
||||||
|
if (sc->sm->sm_type == XFS_SCRUB_TYPE_RMAPBT)
|
||||||
|
return true;
|
||||||
|
mask = XFS_SICK_AG_RMAPBT;
|
||||||
|
break;
|
||||||
|
case XFS_BTNUM_REFC:
|
||||||
|
if (sc->sm->sm_type == XFS_SCRUB_TYPE_REFCNTBT)
|
||||||
|
return true;
|
||||||
|
mask = XFS_SICK_AG_REFCNTBT;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
ASSERT(0);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (xfs_ag_has_sickness(pag, mask)) {
|
||||||
|
sc->sm->sm_flags |= XFS_SCRUB_OFLAG_XFAIL;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
@ -8,5 +8,7 @@
|
|||||||
|
|
||||||
unsigned int xchk_health_mask_for_scrub_type(__u32 scrub_type);
|
unsigned int xchk_health_mask_for_scrub_type(__u32 scrub_type);
|
||||||
void xchk_update_health(struct xfs_scrub *sc);
|
void xchk_update_health(struct xfs_scrub *sc);
|
||||||
|
bool xchk_ag_btree_healthy_enough(struct xfs_scrub *sc, struct xfs_perag *pag,
|
||||||
|
xfs_btnum_t btnum);
|
||||||
|
|
||||||
#endif /* __XFS_SCRUB_HEALTH_H__ */
|
#endif /* __XFS_SCRUB_HEALTH_H__ */
|
||||||
|
Loading…
Reference in New Issue
Block a user