LU-13852 pcc: don't alloc FID in LLITE for pcc open

ll_lookup_it(IT_OPEN) always alloc FID on MDT0 for pcc open, but
the open request is sent to MDT where the name hash points to,
which may be different from the MDT where the FID is, which will
trigger osp_md_create() assertion because file is created remotely.

This FID allocation is not necessary, and it can be left to be done
in lmv_intent_open() by LMV layer, because the MDT is chosen in
LMV. Then when it's done, the FID allocated can be used to initialize
PCC inode.

Change assertion in osp_md_create() to error message and return
error.

Update sanity-sec 2a for this.

Signed-off-by: Lai Siyao <lai.siyao@whamcloud.com>
Change-Id: I3ccea3f9e7cca5083695c71135b9a5805f833b14
Reviewed-on: https://review.whamcloud.com/39568
Reviewed-by: Yingjin Qian <qian@ddn.com>
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index ce1569f..8470499 100644 (file)
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -914,8 +914,6 @@ static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry,
        }
 
        if (pca && pca->pca_dataset) {
        }
 
        if (pca && pca->pca_dataset) {

-               struct pcc_dataset *dataset = pca->pca_dataset;
-

                OBD_ALLOC_PTR(lum);
                if (lum == NULL)
                        GOTO(out, retval = ERR_PTR(-ENOMEM));
                OBD_ALLOC_PTR(lum);
                if (lum == NULL)
                        GOTO(out, retval = ERR_PTR(-ENOMEM));


@@ -924,18 +922,7 @@ static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry,
                lum->lmm_pattern = LOV_PATTERN_F_RELEASED | LOV_PATTERN_RAID0;
                op_data->op_data = lum;
                op_data->op_data_size = sizeof(*lum);
                lum->lmm_pattern = LOV_PATTERN_F_RELEASED | LOV_PATTERN_RAID0;
                op_data->op_data = lum;
                op_data->op_data_size = sizeof(*lum);

-               op_data->op_archive_id = dataset->pccd_rwid;
-
-               rc = obd_fid_alloc(NULL, ll_i2mdexp(parent), &op_data->op_fid2,
-                                  op_data);
-               if (rc)
-                       GOTO(out, retval = ERR_PTR(rc));
-
-               rc = pcc_inode_create(parent->i_sb, dataset, &op_data->op_fid2,
-                                     &pca->pca_dentry);
-               if (rc)
-                       GOTO(out, retval = ERR_PTR(rc));
-
+               op_data->op_archive_id = pca->pca_dataset->pccd_rwid;

                it->it_flags |= MDS_OPEN_PCC;
        }
 
                it->it_flags |= MDS_OPEN_PCC;
        }
 


@@ -970,6 +957,14 @@ static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry,
        if (rc < 0)
                GOTO(out, retval = ERR_PTR(rc));
 
        if (rc < 0)
                GOTO(out, retval = ERR_PTR(rc));
 

+       if (pca && pca->pca_dataset) {
+               rc = pcc_inode_create(parent->i_sb, pca->pca_dataset,
+                                     &op_data->op_fid2,
+                                     &pca->pca_dentry);
+               if (rc)
+                       GOTO(out, retval = ERR_PTR(rc));
+       }
+

        /* dir layout may change */
        ll_unlock_md_op_lsm(op_data);
        rc = ll_lookup_it_finish(req, it, parent, &dentry,
        /* dir layout may change */
        ll_unlock_md_op_lsm(op_data);
        rc = ll_lookup_it_finish(req, it, parent, &dentry,

diff --git a/lustre/lmv/lmv_intent.c b/lustre/lmv/lmv_intent.c
index b0e353f..e9ae2c5 100644 (file)
--- a/lustre/lmv/lmv_intent.c
+++ b/lustre/lmv/lmv_intent.c
@@ -346,8 +346,7 @@ retry:
                op_data->op_mds = tgt->ltd_index;
        } else {
                LASSERT(fid_is_sane(&op_data->op_fid1));
                op_data->op_mds = tgt->ltd_index;
        } else {
                LASSERT(fid_is_sane(&op_data->op_fid1));

-               LASSERT(it->it_flags & MDS_OPEN_PCC ||
-                       fid_is_zero(&op_data->op_fid2));
+               LASSERT(fid_is_zero(&op_data->op_fid2));

                LASSERT(op_data->op_name != NULL);
 
                tgt = lmv_locate_tgt(lmv, op_data);
                LASSERT(op_data->op_name != NULL);
 
                tgt = lmv_locate_tgt(lmv, op_data);


@@ -357,8 +356,7 @@ retry:
 
        /* If it is ready to open the file by FID, do not need
         * allocate FID at all, otherwise it will confuse MDT */
 
        /* If it is ready to open the file by FID, do not need
         * allocate FID at all, otherwise it will confuse MDT */

-       if ((it->it_op & IT_CREAT) && !(it->it_flags & MDS_OPEN_BY_FID ||
-                                       it->it_flags & MDS_OPEN_PCC)) {
+       if ((it->it_op & IT_CREAT) && !(it->it_flags & MDS_OPEN_BY_FID)) {

                /*
                 * For lookup(IT_CREATE) cases allocate new fid and setup FLD
                 * for it.
                /*
                 * For lookup(IT_CREATE) cases allocate new fid and setup FLD
                 * for it.

diff --git a/lustre/osp/osp_md_object.c b/lustre/osp/osp_md_object.c
index f01682c..6ee2c99 100644 (file)
--- a/lustre/osp/osp_md_object.c
+++ b/lustre/osp/osp_md_object.c
@@ -164,7 +164,12 @@ int osp_md_create(const struct lu_env *env, struct dt_object *dt,
        update = thandle_to_osp_update_request(th);
        LASSERT(update != NULL);
 
        update = thandle_to_osp_update_request(th);
        LASSERT(update != NULL);
 

-       LASSERT(attr->la_valid & LA_TYPE);
+       if (!(attr->la_valid & LA_TYPE)) {
+               CERROR("%s: create type not specified: valid %llx\n",
+                      dt->do_lu.lo_dev->ld_obd->obd_name, attr->la_valid);
+               GOTO(out, rc = -EINVAL);
+       }
+

        rc = OSP_UPDATE_RPC_PACK(env, out_create_pack, update,
                                 lu_object_fid(&dt->do_lu), attr, hint, dof);
        if (rc != 0)
        rc = OSP_UPDATE_RPC_PACK(env, out_create_pack, update,
                                 lu_object_fid(&dt->do_lu), attr, hint, dof);
        if (rc != 0)

diff --git a/lustre/tests/sanity-pcc.sh b/lustre/tests/sanity-pcc.sh
index 48fc119..83fd952 100644 (file)
--- a/lustre/tests/sanity-pcc.sh
+++ b/lustre/tests/sanity-pcc.sh
@@ -483,7 +483,7 @@ test_2a() {
        copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
        setup_pcc_mapping
        file=$DIR/$tdir/multiop
        copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
        setup_pcc_mapping
        file=$DIR/$tdir/multiop

-       mkdir -p $DIR/$tdir
+       $LFS mkdir -i -1 -c $MDSCOUNT $DIR/$tdir

        rm -f $file
 
        do_facet $SINGLEAGT $LFS project -sp $project_id $DIR/$tdir ||
        rm -f $file
 
        do_facet $SINGLEAGT $LFS project -sp $project_id $DIR/$tdir ||