LU-3951 lfsck: OST-object inconsistency self detect/repair

[fs/lustre-release.git] / lustre / ofd / ofd_objects.c

diff --git a/lustre/ofd/ofd_objects.c b/lustre/ofd/ofd_objects.c
index 3917969..2f19478 100644 (file)
--- a/lustre/ofd/ofd_objects.c
+++ b/lustre/ofd/ofd_objects.c
@@ -53,7 +53,9 @@ int ofd_version_get_check(struct ofd_thread_info *info,
        dt_obj_version_t curr_version;
 
        LASSERT(ofd_object_exists(fo));
-       LASSERT(info->fti_exp);
+
+       if (info->fti_exp)
+               RETURN(0);
 
        curr_version = dt_version_get(info->fti_env, ofd_object_child(fo));
        if ((__s64)curr_version == -EOPNOTSUPP)
@@ -112,32 +114,38 @@ struct ofd_object *ofd_object_find_or_create(const struct lu_env *env,
        RETURN(ofd_obj(fo_obj));
 }
 
-int ofd_object_ff_check(const struct lu_env *env, struct ofd_object *fo)
+int ofd_object_ff_load(const struct lu_env *env, struct ofd_object *fo)
 {
-       int rc = 0;
+       struct ofd_thread_info  *info = ofd_info(env);
+       struct filter_fid_old   *ff   = &info->fti_mds_fid_old;
+       struct lu_buf           *buf  = &info->fti_buf;
+       struct lu_fid           *pfid = &fo->ofo_pfid;
+       int                      rc   = 0;
 
-       ENTRY;
+       if (fid_is_sane(pfid))
+               return 0;
 
-       if (!fo->ofo_ff_exists) {
-               /*
-                * This actually means that we don't know whether the object
-                * has the "fid" EA or not.
-                */
-               rc = dt_xattr_get(env, ofd_object_child(fo), &LU_BUF_NULL,
-                                 XATTR_NAME_FID, BYPASS_CAPA);
-               if (rc >= 0 || rc == -ENODATA) {
-                       /*
-                        * Here we assume that, if the object doesn't have the
-                        * "fid" EA, the caller will add one, unless a fatal
-                        * error (e.g., a memory or disk failure) prevents it
-                        * from doing so.
-                        */
-                       fo->ofo_ff_exists = 1;
-               }
-               if (rc > 0)
-                       rc = 0;
+       buf->lb_buf = ff;
+       buf->lb_len = sizeof(*ff);
+       rc = dt_xattr_get(env, ofd_object_child(fo), buf, XATTR_NAME_FID,
+                         BYPASS_CAPA);
+       if (rc < 0)
+               return rc;
+
+       if (rc < sizeof(struct lu_fid)) {
+               fid_zero(pfid);
+
+               return -ENODATA;
        }
-       RETURN(rc);
+
+       pfid->f_seq = le64_to_cpu(ff->ff_parent.f_seq);
+       pfid->f_oid = le32_to_cpu(ff->ff_parent.f_oid);
+       /* Currently, the filter_fid::ff_parent::f_ver is not the real parent
+        * MDT-object's FID::f_ver, instead it is the OST-object index in its
+        * parent MDT-object's layout EA. */
+       pfid->f_stripe_idx = le32_to_cpu(ff->ff_parent.f_stripe_idx);
+
+       return 0;
 }
 
 void ofd_object_put(const struct lu_env *env, struct ofd_object *fo)
@@ -435,7 +443,7 @@ int ofd_attr_set(const struct lu_env *env, struct ofd_object *fo,
                GOTO(unlock, rc);
 
        if (ff != NULL) {
-               rc = ofd_object_ff_check(env, fo);
+               rc = ofd_object_ff_load(env, fo);
                if (rc == -ENODATA)
                        ff_needed = 1;
                else if (rc < 0)
@@ -469,20 +477,34 @@ int ofd_attr_set(const struct lu_env *env, struct ofd_object *fo,
        if (rc)
                GOTO(stop, rc);
 
-       if (ff_needed)
+       if (ff_needed) {
                rc = dt_xattr_set(env, ofd_object_child(fo), &info->fti_buf,
                                  XATTR_NAME_FID, 0, th, BYPASS_CAPA);
+               if (rc == 0) {
+                       fo->ofo_pfid.f_seq = le64_to_cpu(ff->ff_parent.f_seq);
+                       fo->ofo_pfid.f_oid = le32_to_cpu(ff->ff_parent.f_oid);
+                       /* Currently, the filter_fid::ff_parent::f_ver is not
+                        * the real parent MDT-object's FID::f_ver, instead it
+                        * is the OST-object index in its parent MDT-object's
+                        * layout EA. */
+                       fo->ofo_pfid.f_stripe_idx =
+                                       le32_to_cpu(ff->ff_parent.f_stripe_idx);
+               }
+       }
+
+       GOTO(stop, rc);
 
 stop:
        ofd_trans_stop(env, ofd, th, rc);
 unlock:
        ofd_write_unlock(env, fo);
-       RETURN(rc);
+
+       return rc;
 }
 
 int ofd_object_punch(const struct lu_env *env, struct ofd_object *fo,
                     __u64 start, __u64 end, struct lu_attr *la,
-                    struct filter_fid *ff)
+                    struct filter_fid *ff, struct obdo *oa)
 {
        struct ofd_thread_info  *info = ofd_info(env);
        struct ofd_device       *ofd = ofd_obj2dev(fo);
@@ -506,6 +528,12 @@ int ofd_object_punch(const struct lu_env *env, struct ofd_object *fo,
        if (!ofd_object_exists(fo))
                GOTO(unlock, rc = -ENOENT);
 
+       if (ofd->ofd_lfsck_verify_pfid && oa->o_valid & OBD_MD_FLFID) {
+               rc = ofd_verify_ff(env, fo, oa);
+               if (rc != 0)
+                       GOTO(unlock, rc);
+       }
+
        /* VBR: version recovery check */
        rc = ofd_version_get_check(info, fo);
        if (rc)
@@ -516,7 +544,7 @@ int ofd_object_punch(const struct lu_env *env, struct ofd_object *fo,
                GOTO(unlock, rc);
 
        if (ff != NULL) {
-               rc = ofd_object_ff_check(env, fo);
+               rc = ofd_object_ff_load(env, fo);
                if (rc == -ENODATA)
                        ff_needed = 1;
                else if (rc < 0)
@@ -558,15 +586,29 @@ int ofd_object_punch(const struct lu_env *env, struct ofd_object *fo,
        if (rc)
                GOTO(stop, rc);
 
-       if (ff_needed)
+       if (ff_needed) {
                rc = dt_xattr_set(env, ofd_object_child(fo), &info->fti_buf,
                                  XATTR_NAME_FID, 0, th, BYPASS_CAPA);
+               if (rc == 0) {
+                       fo->ofo_pfid.f_seq = le64_to_cpu(ff->ff_parent.f_seq);
+                       fo->ofo_pfid.f_oid = le32_to_cpu(ff->ff_parent.f_oid);
+                       /* Currently, the filter_fid::ff_parent::f_ver is not
+                        * the real parent MDT-object's FID::f_ver, instead it
+                        * is the OST-object index in its parent MDT-object's
+                        * layout EA. */
+                       fo->ofo_pfid.f_stripe_idx =
+                                       le32_to_cpu(ff->ff_parent.f_stripe_idx);
+               }
+       }
+
+       GOTO(stop, rc);
 
 stop:
        ofd_trans_stop(env, ofd, th, rc);
 unlock:
        ofd_write_unlock(env, fo);
-       RETURN(rc);
+
+       return rc;
 }
 
 int ofd_object_destroy(const struct lu_env *env, struct ofd_object *fo,