LU-6895 lfsck: drop bad OI files after MDT file-level restore

[fs/lustre-release.git] / lustre / lfsck / lfsck_engine.c

diff --git a/lustre/lfsck/lfsck_engine.c b/lustre/lfsck/lfsck_engine.c
index 6daaf80..d1053c1 100644 (file)
--- a/lustre/lfsck/lfsck_engine.c
+++ b/lustre/lfsck/lfsck_engine.c
@@ -1006,6 +1006,18 @@ int lfsck_master_engine(void *args)
        int                       rc;
        ENTRY;
 
+       /* There will be some objects verification during the LFSCK start,
+        * such as the subsequent lfsck_verify_lpf(). Trigger low layer OI
+        * OI scrub before that to handle the potential inconsistence. */
+       oit_di = oit_iops->init(env, oit_obj, lfsck->li_args_oit);
+       if (IS_ERR(oit_di)) {
+               rc = PTR_ERR(oit_di);
+               CDEBUG(D_LFSCK, "%s: master engine fail to init iteration: "
+                      "rc = %d\n", lfsck_lfsck2name(lfsck), rc);
+
+               GOTO(fini_args, rc);
+       }
+
        if (lfsck->li_master &&
            (!list_empty(&lfsck->li_list_scan) ||
             !list_empty(&lfsck->li_list_double_scan))) {
@@ -1021,15 +1033,6 @@ int lfsck_master_engine(void *args)
                               lfsck_lfsck2name(lfsck), rc);
        }
 
-       oit_di = oit_iops->init(env, oit_obj, lfsck->li_args_oit);
-       if (IS_ERR(oit_di)) {
-               rc = PTR_ERR(oit_di);
-               CDEBUG(D_LFSCK, "%s: master engine fail to init iteration: "
-                      "rc = %d\n", lfsck_lfsck2name(lfsck), rc);
-
-               GOTO(fini_args, rc);
-       }
-
        spin_lock(&lfsck->li_lock);
        lfsck->li_di_oit = oit_di;
        spin_unlock(&lfsck->li_lock);