LU-9771 flr: instantiate component for truncate

layout intent for truncate IO needs stale components for non
primary mirror overlapping [trunc_size, eof), while needs to
instantiate components overlapping [0, trunc_size).

Test-Parameters: testlist=sanity-flr
Signed-off-by: Bobi Jam <bobijam.xu@intel.com>
Change-Id: Ibf31e3e1fd68d1a643f2ed3ac5b9e3c778563895
Signed-off-by: Jinshan Xiong <jinshan.xiong@intel.com>
Reviewed-on: https://review.whamcloud.com/29099
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Lai Siyao <lai.siyao@intel.com>
Tested-by: Jenkins
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>

diff --git a/lustre/include/uapi/linux/lustre/lustre_idl.h b/lustre/include/uapi/linux/lustre/lustre_idl.h
index 12dedba..a8c3c6f 100644 (file)
--- a/lustre/include/uapi/linux/lustre/lustre_idl.h
+++ b/lustre/include/uapi/linux/lustre/lustre_idl.h
@@ -3237,7 +3237,7 @@ struct getparent {
        char            gp_name[0];     /**< zero-terminated link name */
 } __attribute__((packed));
 
        char            gp_name[0];     /**< zero-terminated link name */
 } __attribute__((packed));
 

-enum {
+enum layout_intent_opc {

        LAYOUT_INTENT_ACCESS    = 0,    /** generic access */
        LAYOUT_INTENT_READ      = 1,    /** not used */
        LAYOUT_INTENT_WRITE     = 2,    /** write file, for comp layout */
        LAYOUT_INTENT_ACCESS    = 0,    /** generic access */
        LAYOUT_INTENT_READ      = 1,    /** not used */
        LAYOUT_INTENT_WRITE     = 2,    /** write file, for comp layout */

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index 52b5d00..b4302cc 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -1982,6 +1982,10 @@ ll_get_grouplock(struct inode *inode, struct file *file, unsigned long arg)
                struct cl_layout cl = {
                        .cl_is_composite = false,
                };
                struct cl_layout cl = {
                        .cl_is_composite = false,
                };

+               struct lu_extent ext = {
+                       .e_start = 0,
+                       .e_end = OBD_OBJECT_EOF,
+               };

 
                env = cl_env_get(&refcheck);
                if (IS_ERR(env))
 
                env = cl_env_get(&refcheck);
                if (IS_ERR(env))


@@ -1989,7 +1993,8 @@ ll_get_grouplock(struct inode *inode, struct file *file, unsigned long arg)
 
                rc = cl_object_layout_get(env, obj, &cl);
                if (!rc && cl.cl_is_composite)
 
                rc = cl_object_layout_get(env, obj, &cl);
                if (!rc && cl.cl_is_composite)

-                       rc = ll_layout_write_intent(inode, 0, OBD_OBJECT_EOF);
+                       rc = ll_layout_write_intent(inode, LAYOUT_INTENT_WRITE,
+                                                   &ext);

 
                cl_env_put(env, &refcheck);
                if (rc)
 
                cl_env_put(env, &refcheck);
                if (rc)


@@ -4891,19 +4896,20 @@ int ll_layout_refresh(struct inode *inode, __u32 *gen)
  * Issue layout intent RPC indicating where in a file an IO is about to write.
  *
  * \param[in] inode    file inode.
  * Issue layout intent RPC indicating where in a file an IO is about to write.
  *
  * \param[in] inode    file inode.

- * \param[in] start    start offset of fille in bytes where an IO is about to
- *                     write.
- * \param[in] end      exclusive end offset in bytes of the write range.
+ * \param[in] ext      write range with start offset of fille in bytes where
+ *                     an IO is about to write, and exclusive end offset in
+ *                     bytes.

  *
  * \retval 0   on success
  * \retval < 0 error code
  */
  *
  * \retval 0   on success
  * \retval < 0 error code
  */

-int ll_layout_write_intent(struct inode *inode, __u64 start, __u64 end)
+int ll_layout_write_intent(struct inode *inode, enum layout_intent_opc opc,
+                          struct lu_extent *ext)

 {
        struct layout_intent intent = {
 {
        struct layout_intent intent = {

-               .li_opc = LAYOUT_INTENT_WRITE,
-               .li_extent.e_start = start,
-               .li_extent.e_end = end,
+               .li_opc = opc,
+               .li_extent.e_start = ext->e_start,
+               .li_extent.e_end = ext->e_end,

        };
        int rc;
        ENTRY;
        };
        int rc;
        ENTRY;

diff --git a/lustre/llite/lcommon_cl.c b/lustre/llite/lcommon_cl.c
index 0bad830..757b336 100644 (file)
--- a/lustre/llite/lcommon_cl.c
+++ b/lustre/llite/lcommon_cl.c
@@ -93,10 +93,10 @@ int cl_setattr_ost(struct cl_object *obj, const struct iattr *attr,
        io->u.ci_setattr.sa_valid = attr->ia_valid;
        io->u.ci_setattr.sa_parent_fid = lu_object_fid(&obj->co_lu);
 
        io->u.ci_setattr.sa_valid = attr->ia_valid;
        io->u.ci_setattr.sa_parent_fid = lu_object_fid(&obj->co_lu);
 

+again:

        if (attr->ia_valid & ATTR_FILE)
                ll_io_set_mirror(io, attr->ia_file);
 
        if (attr->ia_valid & ATTR_FILE)
                ll_io_set_mirror(io, attr->ia_file);
 

-again:

         if (cl_io_init(env, io, CIT_SETATTR, io->ci_obj) == 0) {
                struct vvp_io *vio = vvp_env_io(env);
 
         if (cl_io_init(env, io, CIT_SETATTR, io->ci_obj) == 0) {
                struct vvp_io *vio = vvp_env_io(env);
 

diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
index e4cba7d..a01a7c0 100644 (file)
--- a/lustre/llite/llite_internal.h
+++ b/lustre/llite/llite_internal.h
@@ -1419,7 +1419,8 @@ static inline void d_lustre_revalidate(struct dentry *dentry)
 int ll_layout_conf(struct inode *inode, const struct cl_object_conf *conf);
 int ll_layout_refresh(struct inode *inode, __u32 *gen);
 int ll_layout_restore(struct inode *inode, loff_t start, __u64 length);
 int ll_layout_conf(struct inode *inode, const struct cl_object_conf *conf);
 int ll_layout_refresh(struct inode *inode, __u32 *gen);
 int ll_layout_restore(struct inode *inode, loff_t start, __u64 length);

-int ll_layout_write_intent(struct inode *inode, __u64 start, __u64 end);
+int ll_layout_write_intent(struct inode *inode, enum layout_intent_opc opc,
+                          struct lu_extent *ext);

 
 int ll_xattr_init(void);
 void ll_xattr_fini(void);
 
 int ll_xattr_init(void);
 void ll_xattr_fini(void);

diff --git a/lustre/llite/vvp_io.c b/lustre/llite/vvp_io.c
index 236e245..f402fb1 100644 (file)
--- a/lustre/llite/vvp_io.c
+++ b/lustre/llite/vvp_io.c
@@ -363,6 +363,8 @@ static void vvp_io_fini(const struct lu_env *env, const struct cl_io_slice *ios)
         * RPC.
         */
        if (io->ci_need_write_intent) {
         * RPC.
         */
        if (io->ci_need_write_intent) {

+               enum layout_intent_opc opc = LAYOUT_INTENT_WRITE;
+

                io->ci_need_write_intent = 0;
 
                LASSERT(io->ci_type == CIT_WRITE ||
                io->ci_need_write_intent = 0;
 
                LASSERT(io->ci_type == CIT_WRITE ||


@@ -372,8 +374,10 @@ static void vvp_io_fini(const struct lu_env *env, const struct cl_io_slice *ios)
                       PFID(lu_object_fid(&obj->co_lu)), io->ci_type,
                       PEXT(&io->ci_write_intent));
 
                       PFID(lu_object_fid(&obj->co_lu)), io->ci_type,
                       PEXT(&io->ci_write_intent));
 

-               rc = ll_layout_write_intent(inode, io->ci_write_intent.e_start,
-                                           io->ci_write_intent.e_end);
+               if (cl_io_is_trunc(io))
+                       opc = LAYOUT_INTENT_TRUNC;
+
+               rc = ll_layout_write_intent(inode, opc, &io->ci_write_intent);

                io->ci_result = rc;
                if (!rc)
                        io->ci_need_restart = 1;
                io->ci_result = rc;
                if (!rc)
                        io->ci_need_restart = 1;

diff --git a/lustre/lod/lod_object.c b/lustre/lod/lod_object.c
index 24516ed..e39d7d6 100644 (file)
--- a/lustre/lod/lod_object.c
+++ b/lustre/lod/lod_object.c
@@ -5248,6 +5248,15 @@ static int lod_declare_update_plain(const struct lu_env *env,
                        GOTO(out, rc);
        }
 
                        GOTO(out, rc);
        }
 

+       if (layout->li_opc == LAYOUT_INTENT_TRUNC) {
+               /**
+                * trunc transfers [size, eof) in the intent extent, while
+                * we'd instantiated components covers [0, size).
+                */
+               layout->li_extent.e_end = layout->li_extent.e_start;
+               layout->li_extent.e_start = 0;
+       }
+

        /* Make sure defined layout covers the requested write range. */
        lod_comp = &lo->ldo_comp_entries[lo->ldo_comp_cnt - 1];
        if (lo->ldo_comp_cnt > 1 &&
        /* Make sure defined layout covers the requested write range. */
        lod_comp = &lo->ldo_comp_entries[lo->ldo_comp_cnt - 1];
        if (lo->ldo_comp_cnt > 1 &&


@@ -5415,7 +5424,16 @@ static int lod_declare_update_rdonly(const struct lu_env *env,
        lod_stale_components(lo, picked, &extent);
 
        /* instantiate components for the picked mirror, start from 0 */
        lod_stale_components(lo, picked, &extent);
 
        /* instantiate components for the picked mirror, start from 0 */

-       extent = (struct lu_extent) { 0, layout->li_extent.e_end };
+       if (layout->li_opc == LAYOUT_INTENT_TRUNC) {
+               /**
+                * trunc transfers [size, eof) in the intent extent, we'd
+                * stale components overlapping [size, eof), while we'd
+                * instantiated components covers [0, size).
+                */
+               extent.e_end = extent.e_start;
+       }
+       extent.e_start = 0;
+

        lod_foreach_mirror_comp(lod_comp, lo, picked) {
                if (!lu_extent_is_overlapped(&extent,
                                             &lod_comp->llc_extent))
        lod_foreach_mirror_comp(lod_comp, lo, picked) {
                if (!lu_extent_is_overlapped(&extent,
                                             &lod_comp->llc_extent))


@@ -5522,7 +5540,16 @@ static int lod_declare_update_write_pending(const struct lu_env *env,
 
                /* 2. find out the components need instantiating.
                 * instantiate [0, mlc->mlc_intent->e_end) */
 
                /* 2. find out the components need instantiating.
                 * instantiate [0, mlc->mlc_intent->e_end) */

+               if (mlc->mlc_intent->li_opc == LAYOUT_INTENT_TRUNC) {
+                       /**
+                        * trunc transfers [size, eof) in the intent extent,
+                        * we'd stale components overlapping [size, eof),
+                        * while we'd instantiated components covers [0, size).
+                        */
+                       extent.e_end = extent.e_start;
+               }

                extent.e_start = 0;
                extent.e_start = 0;

+

                lod_foreach_mirror_comp(lod_comp, lo, primary) {
                        if (!lu_extent_is_overlapped(&extent,
                                                     &lod_comp->llc_extent))
                lod_foreach_mirror_comp(lod_comp, lo, primary) {
                        if (!lu_extent_is_overlapped(&extent,
                                                     &lod_comp->llc_extent))

diff --git a/lustre/lov/lov_io.c b/lustre/lov/lov_io.c
index 81fc4c1..42e0aee 100644 (file)
--- a/lustre/lov/lov_io.c
+++ b/lustre/lov/lov_io.c
@@ -539,9 +539,10 @@ static int lov_io_slice_init(struct lov_io *lio,
              (cl_io_is_trunc(io) && io->u.ci_setattr.sa_attr.lvb_size > 0)))
                GOTO(out, result = 0);
 
              (cl_io_is_trunc(io) && io->u.ci_setattr.sa_attr.lvb_size > 0)))
                GOTO(out, result = 0);
 

-       ext.e_start = lio->lis_pos;
-       ext.e_end = lio->lis_endpos;
+       io->ci_write_intent.e_start = lio->lis_pos;
+       io->ci_write_intent.e_end = lio->lis_endpos;

 
 

+       ext = io->ci_write_intent;

        /* for truncate, it only needs to instantiate the components
         * before the truncated size. */
        if (cl_io_is_trunc(io)) {
        /* for truncate, it only needs to instantiate the components
         * before the truncated size. */
        if (cl_io_is_trunc(io)) {


@@ -553,7 +554,6 @@ static int lov_io_slice_init(struct lov_io *lio,
        lov_foreach_io_layout(index, lio, &ext) {
                if (!lsm_entry_inited(obj->lo_lsm, index)) {
                        io->ci_need_write_intent = 1;
        lov_foreach_io_layout(index, lio, &ext) {
                if (!lsm_entry_inited(obj->lo_lsm, index)) {
                        io->ci_need_write_intent = 1;

-                       io->ci_write_intent = ext;

                        break;
                }
        }
                        break;
                }
        }

diff --git a/lustre/tests/sanity-pfl.sh b/lustre/tests/sanity-pfl.sh
index 372f9ba..88c6c72 100644 (file)
--- a/lustre/tests/sanity-pfl.sh
+++ b/lustre/tests/sanity-pfl.sh
@@ -451,7 +451,7 @@ test_11() {
        $TRUNCATE $comp_file $((1024*1024*1+1))
 
        f2=$($LFS getstripe -I2 $comp_file | grep "l_fid")
        $TRUNCATE $comp_file $((1024*1024*1+1))
 
        f2=$($LFS getstripe -I2 $comp_file | grep "l_fid")

-       [[ -z $f2 ]] && error "2: 2nd component uninstantiated"
+       [[ -z $f2 ]] && error "3: 2nd component uninstantiated"

        f3=$($LFS getstripe -I3 $comp_file | grep "l_fid")
        [[ -z $f3 ]] && error "3: 3rd component uninstantiated"
        f4=$($LFS getstripe -I4 $comp_file | grep "l_fid")
        f3=$($LFS getstripe -I3 $comp_file | grep "l_fid")
        [[ -z $f3 ]] && error "3: 3rd component uninstantiated"
        f4=$($LFS getstripe -I4 $comp_file | grep "l_fid")