LU-12681 osc: wrong cache of LVB attrs, part2

[fs/lustre-release.git] / lustre / mdc / mdc_dev.c

diff --git a/lustre/mdc/mdc_dev.c b/lustre/mdc/mdc_dev.c
index b85481e..036dc92 100644 (file)
--- a/lustre/mdc/mdc_dev.c
+++ b/lustre/mdc/mdc_dev.c
@@ -68,21 +68,17 @@ static void mdc_lock_lvb_update(const struct lu_env *env,
                                struct ldlm_lock *dlmlock,
                                struct ost_lvb *lvb);
 
                                struct ldlm_lock *dlmlock,
                                struct ost_lvb *lvb);
 

-static int mdc_set_dom_lock_data(const struct lu_env *env,
-                                struct ldlm_lock *lock, void *data)
+static int mdc_set_dom_lock_data(struct ldlm_lock *lock, void *data)

 {
 {

-       struct osc_object *obj = data;

        int set = 0;
 
        LASSERT(lock != NULL);
        LASSERT(lock->l_glimpse_ast == mdc_ldlm_glimpse_ast);
 
        lock_res_and_lock(lock);
        int set = 0;
 
        LASSERT(lock != NULL);
        LASSERT(lock->l_glimpse_ast == mdc_ldlm_glimpse_ast);
 
        lock_res_and_lock(lock);

-       if (lock->l_ast_data == NULL) {
-               lock->l_ast_data = data;
-               mdc_lock_lvb_update(env, obj, lock, NULL);
-       }

 
 

+       if (lock->l_ast_data == NULL)
+               lock->l_ast_data = data;

        if (lock->l_ast_data == data)
                set = 1;
 
        if (lock->l_ast_data == data)
                set = 1;
 


@@ -92,9 +88,9 @@ static int mdc_set_dom_lock_data(const struct lu_env *env,
 }
 
 int mdc_dom_lock_match(const struct lu_env *env, struct obd_export *exp,
 }
 
 int mdc_dom_lock_match(const struct lu_env *env, struct obd_export *exp,

-                      struct ldlm_res_id *res_id,
-                      enum ldlm_type type, union ldlm_policy_data *policy,
-                      enum ldlm_mode mode, __u64 *flags, void *data,
+                      struct ldlm_res_id *res_id, enum ldlm_type type,
+                      union ldlm_policy_data *policy, enum ldlm_mode mode,
+                      __u64 *flags, struct osc_object *obj,

                       struct lustre_handle *lockh, int unref)
 {
        struct obd_device *obd = exp->exp_obd;
                       struct lustre_handle *lockh, int unref)
 {
        struct obd_device *obd = exp->exp_obd;


@@ -108,11 +104,19 @@ int mdc_dom_lock_match(const struct lu_env *env, struct obd_export *exp,
        if (rc == 0 || lflags & LDLM_FL_TEST_LOCK)
                RETURN(rc);
 
        if (rc == 0 || lflags & LDLM_FL_TEST_LOCK)
                RETURN(rc);
 

-       if (data != NULL) {
+       if (obj != NULL) {

                struct ldlm_lock *lock = ldlm_handle2lock(lockh);
 
                LASSERT(lock != NULL);
                struct ldlm_lock *lock = ldlm_handle2lock(lockh);
 
                LASSERT(lock != NULL);

-               if (!mdc_set_dom_lock_data(env, lock, data)) {
+               if (mdc_set_dom_lock_data(lock, obj)) {
+                       lock_res_and_lock(lock);
+                       if (!ldlm_is_lvb_cached(lock)) {
+                               LASSERT(lock->l_ast_data == obj);
+                               mdc_lock_lvb_update(env, obj, lock, NULL);
+                               ldlm_set_lvb_cached(lock);
+                       }
+                       unlock_res_and_lock(lock);
+               } else {

                        ldlm_lock_decref(lockh, rc);
                        rc = 0;
                }
                        ldlm_lock_decref(lockh, rc);
                        rc = 0;
                }


@@ -411,6 +415,7 @@ void mdc_lock_lvb_update(const struct lu_env *env, struct osc_object *osc,
        struct cl_attr *attr = &osc_env_info(env)->oti_attr;
        unsigned valid = CAT_BLOCKS | CAT_ATIME | CAT_CTIME | CAT_MTIME |
                         CAT_SIZE;
        struct cl_attr *attr = &osc_env_info(env)->oti_attr;
        unsigned valid = CAT_BLOCKS | CAT_ATIME | CAT_CTIME | CAT_MTIME |
                         CAT_SIZE;

+       unsigned int setkms = 0;

 
        ENTRY;
 
 
        ENTRY;
 


@@ -428,16 +433,22 @@ void mdc_lock_lvb_update(const struct lu_env *env, struct osc_object *osc,
                size = lvb->lvb_size;
 
                if (size >= oinfo->loi_kms) {
                size = lvb->lvb_size;
 
                if (size >= oinfo->loi_kms) {

-                       LDLM_DEBUG(dlmlock, "lock acquired, setting rss=%llu,"
-                                  " kms=%llu", lvb->lvb_size, size);

                        valid |= CAT_KMS;
                        attr->cat_kms = size;
                        valid |= CAT_KMS;
                        attr->cat_kms = size;

-               } else {
-                       LDLM_DEBUG(dlmlock, "lock acquired, setting rss=%llu,"
-                                  " leaving kms=%llu",
-                                  lvb->lvb_size, oinfo->loi_kms);
+                       setkms = 1;

                }
        }
                }
        }

+
+       /* The size should not be less than the kms */
+       if (attr->cat_size < oinfo->loi_kms)
+               attr->cat_size = oinfo->loi_kms;
+
+       LDLM_DEBUG(dlmlock, "acquired size %llu, setting rss=%llu;%s "
+                  "kms=%llu, end=%llu", lvb->lvb_size, attr->cat_size,
+                  setkms ? "" : " leaving",
+                  setkms ? attr->cat_kms : oinfo->loi_kms,
+                  dlmlock ? dlmlock->l_policy_data.l_extent.end : -1ull);
+

        cl_object_attr_update(env, obj, attr, valid);
        cl_object_attr_unlock(obj);
        EXIT;
        cl_object_attr_update(env, obj, attr, valid);
        cl_object_attr_unlock(obj);
        EXIT;


@@ -446,6 +457,7 @@ void mdc_lock_lvb_update(const struct lu_env *env, struct osc_object *osc,
 static void mdc_lock_granted(const struct lu_env *env, struct osc_lock *oscl,
                             struct lustre_handle *lockh)
 {
 static void mdc_lock_granted(const struct lu_env *env, struct osc_lock *oscl,
                             struct lustre_handle *lockh)
 {

+       struct osc_object *osc = cl2osc(oscl->ols_cl.cls_obj);

        struct ldlm_lock *dlmlock;
 
        ENTRY;
        struct ldlm_lock *dlmlock;
 
        ENTRY;


@@ -486,8 +498,8 @@ static void mdc_lock_granted(const struct lu_env *env, struct osc_lock *oscl,
                /* no lvb update for matched lock */
                if (!ldlm_is_lvb_cached(dlmlock)) {
                        LASSERT(oscl->ols_flags & LDLM_FL_LVB_READY);
                /* no lvb update for matched lock */
                if (!ldlm_is_lvb_cached(dlmlock)) {
                        LASSERT(oscl->ols_flags & LDLM_FL_LVB_READY);

-                       mdc_lock_lvb_update(env, cl2osc(oscl->ols_cl.cls_obj),
-                                           dlmlock, NULL);
+                       LASSERT(osc == dlmlock->l_ast_data);
+                       mdc_lock_lvb_update(env, osc, dlmlock, NULL);

                        ldlm_set_lvb_cached(dlmlock);
                }
        }
                        ldlm_set_lvb_cached(dlmlock);
                }
        }


@@ -716,7 +728,7 @@ int mdc_enqueue_send(const struct lu_env *env, struct obd_export *exp,
                if (OBD_FAIL_CHECK(OBD_FAIL_MDC_GLIMPSE_DDOS))
                        ldlm_set_kms_ignore(matched);
 
                if (OBD_FAIL_CHECK(OBD_FAIL_MDC_GLIMPSE_DDOS))
                        ldlm_set_kms_ignore(matched);
 

-               if (mdc_set_dom_lock_data(env, matched, einfo->ei_cbdata)) {
+               if (mdc_set_dom_lock_data(matched, einfo->ei_cbdata)) {

                        *flags |= LDLM_FL_LVB_READY;
 
                        /* We already have a lock, and it's referenced. */
                        *flags |= LDLM_FL_LVB_READY;
 
                        /* We already have a lock, and it's referenced. */


@@ -1395,14 +1407,19 @@ static int mdc_object_ast_clear(struct ldlm_lock *lock, void *data)
 
                /* Updates lvb in lock by the cached oinfo */
                oinfo = osc->oo_oinfo;
 
                /* Updates lvb in lock by the cached oinfo */
                oinfo = osc->oo_oinfo;

+
+               LDLM_DEBUG(lock, "update lock size %llu blocks %llu [cma]time: "
+                          "%llu %llu %llu by oinfo size %llu blocks %llu "
+                          "[cma]time %llu %llu %llu", lvb->lvb_size,
+                          lvb->lvb_blocks, lvb->lvb_ctime, lvb->lvb_mtime,
+                          lvb->lvb_atime, oinfo->loi_lvb.lvb_size,
+                          oinfo->loi_lvb.lvb_blocks, oinfo->loi_lvb.lvb_ctime,
+                          oinfo->loi_lvb.lvb_mtime, oinfo->loi_lvb.lvb_atime);
+               LASSERT(oinfo->loi_lvb.lvb_size >= oinfo->loi_kms);
+

                cl_object_attr_lock(&osc->oo_cl);
                memcpy(lvb, &oinfo->loi_lvb, sizeof(oinfo->loi_lvb));
                cl_object_attr_unlock(&osc->oo_cl);
                cl_object_attr_lock(&osc->oo_cl);
                memcpy(lvb, &oinfo->loi_lvb, sizeof(oinfo->loi_lvb));
                cl_object_attr_unlock(&osc->oo_cl);

-
-               LDLM_DEBUG(lock, "update lvb size %llu blocks %llu [cma]time: "
-                          "%llu %llu %llu", lvb->lvb_size, lvb->lvb_blocks,
-                          lvb->lvb_ctime, lvb->lvb_mtime, lvb->lvb_atime);
-

                ldlm_clear_lvb_cached(lock);
        }
        RETURN(LDLM_ITER_CONTINUE);
                ldlm_clear_lvb_cached(lock);
        }
        RETURN(LDLM_ITER_CONTINUE);