From: Darrick J. Wong <djwong@xxxxxxxxxx>
If a repair says it didn't do anything on account of not being able to
complete a scan of the metadata, retry the repair a few times; if even
that doesn't work, we can delay it to phase 4.
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
scrub/repair.c | 15 ++++++++++++++-
scrub/scrub.c | 3 +--
scrub/scrub_private.h | 10 ++++++++++
3 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/scrub/repair.c b/scrub/repair.c
index 8624167246a..c1ab03d6f02 100644
--- a/scrub/repair.c
+++ b/scrub/repair.c
@@ -57,6 +57,7 @@ xfs_repair_metadata(
struct xfs_scrub_metadata oldm;
DEFINE_DESCR(dsc, ctx, format_scrub_descr);
bool repair_only;
+ unsigned int tries = 0;
int error;
/*
@@ -98,6 +99,7 @@ xfs_repair_metadata(
str_info(ctx, descr_render(&dsc),
_("Attempting optimization."));
+retry:
error = -xfrog_scrub_metadata(xfdp, &meta);
switch (error) {
case 0:
@@ -176,9 +178,20 @@ _("Read-only filesystem; cannot make changes."));
return CHECK_DONE;
}
+ /*
+ * If the kernel says the repair was incomplete or that there was a
+ * cross-referencing discrepancy but no obvious corruption, we'll try
+ * the repair again, just in case the fs was busy. Only retry so many
+ * times.
+ */
+ if (want_retry(&meta) && tries < 10) {
+ tries++;
+ goto retry;
+ }
+
if (repair_flags & XRM_FINAL_WARNING)
scrub_warn_incomplete_scrub(ctx, &dsc, &meta);
- if (needs_repair(&meta)) {
+ if (needs_repair(&meta) || is_incomplete(&meta)) {
/*
* Still broken; if we've been told not to complain then we
* just requeue this and try again later. Otherwise we
diff --git a/scrub/scrub.c b/scrub/scrub.c
index b970d1cfe90..699e9aa3940 100644
--- a/scrub/scrub.c
+++ b/scrub/scrub.c
@@ -137,8 +137,7 @@ _("Filesystem is shut down, aborting."));
* we'll try the scan again, just in case the fs was busy.
* Only retry so many times.
*/
- if (tries < 10 && (is_incomplete(meta) ||
- (xref_disagrees(meta) && !is_corrupt(meta)))) {
+ if (want_retry(meta) && tries < 10) {
tries++;
goto retry;
}
diff --git a/scrub/scrub_private.h b/scrub/scrub_private.h
index eafb750b0d1..b54384c2091 100644
--- a/scrub/scrub_private.h
+++ b/scrub/scrub_private.h
@@ -49,6 +49,16 @@ static inline bool needs_repair(struct xfs_scrub_metadata *sm)
return is_corrupt(sm) || xref_disagrees(sm);
}
+/*
+ * We want to retry an operation if the kernel says it couldn't complete the
+ * scan/repair; or if there were cross-referencing problems but the object was
+ * not obviously corrupt.
+ */
+static inline bool want_retry(struct xfs_scrub_metadata *sm)
+{
+ return is_incomplete(sm) || (xref_disagrees(sm) && !is_corrupt(sm));
+}
+
void scrub_warn_incomplete_scrub(struct scrub_ctx *ctx, struct descr *dsc,
struct xfs_scrub_metadata *meta);
