LU-8472 scrub: try to avoid recovery during OI scrub

[fs/lustre-release.git] / lustre / target / update_recovery.c

diff --git a/lustre/target/update_recovery.c b/lustre/target/update_recovery.c
index 2e36524..85764cf 100644 (file)
--- a/lustre/target/update_recovery.c
+++ b/lustre/target/update_recovery.c
@@ -44,11 +44,13 @@
 #define DEBUG_SUBSYSTEM S_CLASS
 
 #include <lu_target.h>
 #define DEBUG_SUBSYSTEM S_CLASS
 
 #include <lu_target.h>

+#include <lustre_obdo.h>

 #include <lustre_update.h>
 #include <lustre_swab.h>
 #include <md_object.h>
 #include <obd.h>
 #include <obd_class.h>
 #include <lustre_update.h>
 #include <lustre_swab.h>
 #include <md_object.h>
 #include <obd.h>
 #include <obd_class.h>

+

 #include "tgt_internal.h"
 
 /**
 #include "tgt_internal.h"
 
 /**


@@ -443,7 +445,7 @@ again:
         * we do not need lock here */
        if (replace_record) {
                /* Replace the update record and master transno */
         * we do not need lock here */
        if (replace_record) {
                /* Replace the update record and master transno */

-               OBD_FREE(dtrq->dtrq_lur, dtrq->dtrq_lur_size);
+               OBD_FREE_LARGE(dtrq->dtrq_lur, dtrq->dtrq_lur_size);

                dtrq->dtrq_lur = NULL;
                dtrq->dtrq_lur_size = llog_update_record_size(lur);
                OBD_ALLOC_LARGE(dtrq->dtrq_lur, dtrq->dtrq_lur_size);
                dtrq->dtrq_lur = NULL;
                dtrq->dtrq_lur_size = llog_update_record_size(lur);
                OBD_ALLOC_LARGE(dtrq->dtrq_lur, dtrq->dtrq_lur_size);


@@ -1165,6 +1167,17 @@ static int update_recovery_exec(const struct lu_env *env,
                dt_obj = dt_locate(env, tdtd->tdtd_dt, fid);
                if (IS_ERR(dt_obj)) {
                        rc = PTR_ERR(dt_obj);
                dt_obj = dt_locate(env, tdtd->tdtd_dt, fid);
                if (IS_ERR(dt_obj)) {
                        rc = PTR_ERR(dt_obj);

+                       if (rc == -EREMCHG)
+                               LCONSOLE_WARN("%.16s: hit invalid OI mapping "
+                                             "for "DFID" during recovering, "
+                                             "that may because auto scrub is "
+                                             "disabled on related MDT, and "
+                                             "will cause recovery failure. "
+                                             "Please enable auto scrub and "
+                                             "retry the recovery.\n",
+                                             tdtd->tdtd_lut->lut_obd->obd_name,
+                                             PFID(fid));
+

                        break;
                }
                sub_dt_obj = dt_object_child(dt_obj);
                        break;
                }
                sub_dt_obj = dt_object_child(dt_obj);