LU-3285 test: add Data-on-MDT tests and fixes

[fs/lustre-release.git] / lustre / lov / lov_object.c

diff --git a/lustre/lov/lov_object.c b/lustre/lov/lov_object.c
index 216221a..ac0493e 100644 (file)
--- a/lustre/lov/lov_object.c
+++ b/lustre/lov/lov_object.c
@@ -449,8 +449,16 @@ static int lov_attr_get_dom(const struct lu_env *env, struct lov_object *lov,
                return OST_LVB_GET_ERR(loi->loi_lvb.lvb_blocks);
 
        cl_lvb2attr(attr, &loi->loi_lvb);
-       attr->cat_kms = attr->cat_size > loi->loi_kms ? attr->cat_size :
-                                                       loi->loi_kms;
+
+       /* DoM component size can be bigger than stripe size after
+        * client's setattr RPC, so do not count anything beyound
+        * component end. Alternatively, check that limit on server
+        * and do not allow size overflow there. */
+       if (attr->cat_size > lle->lle_extent.e_end)
+               attr->cat_size = lle->lle_extent.e_end;
+
+       attr->cat_kms = attr->cat_size;
+
        dom->lo_dom_r0.lo_attr_valid = 1;
        *lov_attr = attr;
 
@@ -530,7 +538,6 @@ static int lov_init_dom(const struct lu_env *env, struct lov_device *dev,
        struct cl_device *mdcdev;
        struct lov_oinfo *loi = NULL;
        struct cl_object_conf *sconf = &lti->lti_stripe_conf;
-       struct inode *inode = conf->coc_inode;
 
        int rc;
        __u32 idx = 0;
@@ -563,15 +570,6 @@ static int lov_init_dom(const struct lu_env *env, struct lov_device *dev,
                RETURN(-ENOMEM);
 
        fid_to_ostid(lu_object_fid(lov2lu(lov)), &loi->loi_oi);
-       /* Initialize lvb structure */
-       loi->loi_lvb.lvb_mtime = LTIME_S(inode->i_mtime);
-       loi->loi_lvb.lvb_atime = LTIME_S(inode->i_atime);
-       loi->loi_lvb.lvb_ctime = LTIME_S(inode->i_ctime);
-       loi->loi_lvb.lvb_blocks = inode->i_blocks;
-       loi->loi_lvb.lvb_size = i_size_read(inode);
-       if (loi->loi_lvb.lvb_size > lsme->lsme_stripe_size)
-               loi->loi_lvb.lvb_size = lsme->lsme_stripe_size;
-       loi_kms_set(loi, loi->loi_lvb.lvb_size);
 
        sconf->u.coc_oinfo = loi;
 again:
@@ -879,6 +877,11 @@ static int lov_attr_get_composite(const struct lu_env *env,
                if (lov_attr == NULL)
                        continue;
 
+               CDEBUG(D_INODE, "COMP ID #%i: s=%llu m=%llu a=%llu c=%llu "
+                      "b=%llu\n", index - 1, lov_attr->cat_size,
+                      lov_attr->cat_mtime, lov_attr->cat_atime,
+                      lov_attr->cat_ctime, lov_attr->cat_blocks);
+
                /* merge results */
                attr->cat_blocks += lov_attr->cat_blocks;
                if (attr->cat_size < lov_attr->cat_size)