LU-4621 ofd: create same count of objects

[fs/lustre-release.git] / lustre / osp / osp_precreate.c

diff --git a/lustre/osp/osp_precreate.c b/lustre/osp/osp_precreate.c
index 574cd0d..7c28e1a 100644 (file)
--- a/lustre/osp/osp_precreate.c
+++ b/lustre/osp/osp_precreate.c
@@ -200,25 +200,8 @@ void osp_statfs_need_now(struct osp_device *d)
 static inline int osp_objs_precreated(const struct lu_env *env,
                                      struct osp_device *osp)
 {
-       struct lu_fid *fid1 = &osp->opd_pre_last_created_fid;
-       struct lu_fid *fid2 = &osp->opd_pre_used_fid;
-
-       LASSERTF(fid_seq(fid1) == fid_seq(fid2),
-                "Created fid"DFID" Next fid "DFID"\n", PFID(fid1), PFID(fid2));
-
-       if (fid_is_idif(fid1)) {
-               struct ost_id *oi1 = &osp_env_info(env)->osi_oi;
-               struct ost_id *oi2 = &osp_env_info(env)->osi_oi2;
-
-               LASSERT(fid_is_idif(fid1) && fid_is_idif(fid2));
-               fid_to_ostid(fid1, oi1);
-               fid_to_ostid(fid2, oi2);
-               LASSERT(ostid_id(oi1) >= ostid_id(oi2));
-
-               return ostid_id(oi1) - ostid_id(oi2);
-       }
-
-       return fid_oid(fid1) - fid_oid(fid2);
+       return osp_fid_diff(&osp->opd_pre_last_created_fid,
+                           &osp->opd_pre_used_fid);
 }
 
 static inline int osp_precreate_near_empty_nolock(const struct lu_env *env,
@@ -288,12 +271,12 @@ int osp_write_last_oid_seq_files(struct lu_env *env, struct osp_device *osp,
 
        th->th_sync |= sync;
        rc = dt_declare_record_write(env, osp->opd_last_used_oid_file,
-                                    lb_oid->lb_len, oid_off, th);
+                                    lb_oid, oid_off, th);
        if (rc != 0)
                GOTO(out, rc);
 
        rc = dt_declare_record_write(env, osp->opd_last_used_seq_file,
-                                    lb_oseq->lb_len, oseq_off, th);
+                                    lb_oseq, oseq_off, th);
        if (rc != 0)
                GOTO(out, rc);
 
@@ -490,11 +473,14 @@ static int osp_precreate_send(const struct lu_env *env, struct osp_device *d)
                GOTO(out_req, rc = -EPROTO);
 
        ostid_to_fid(fid, &body->oa.o_oi, d->opd_index);
-       LASSERTF(lu_fid_diff(fid, &d->opd_pre_used_fid) > 0,
-                "reply fid "DFID" pre used fid "DFID"\n", PFID(fid),
-                PFID(&d->opd_pre_used_fid));
+       if (osp_fid_diff(fid, &d->opd_pre_used_fid) <= 0) {
+               CERROR("%s: precreate fid "DFID" < local used fid "DFID
+                      ": rc = %d\n", d->opd_obd->obd_name,
+                      PFID(fid), PFID(&d->opd_pre_used_fid), -ESTALE);
+               GOTO(out_req, rc = -ESTALE);
+       }
 
-       diff = lu_fid_diff(fid, &d->opd_pre_last_created_fid);
+       diff = osp_fid_diff(fid, &d->opd_pre_last_created_fid);
 
        spin_lock(&d->opd_pre_lock);
        if (diff < grow) {
@@ -509,6 +495,9 @@ static int osp_precreate_send(const struct lu_env *env, struct osp_device *d)
                d->opd_pre_grow_slow = 0;
        }
 
+       body = req_capsule_client_get(&req->rq_pill, &RMF_OST_BODY);
+       fid_to_ostid(fid, &body->oa.o_oi);
+
        d->opd_pre_last_created_fid = *fid;
        spin_unlock(&d->opd_pre_lock);
 
@@ -696,7 +685,7 @@ static int osp_precreate_cleanup_orphans(struct lu_env *env,
        ostid_to_fid(last_fid, &body->oa.o_oi, d->opd_index);
 
        spin_lock(&d->opd_pre_lock);
-       diff = lu_fid_diff(&d->opd_last_used_fid, last_fid);
+       diff = osp_fid_diff(&d->opd_last_used_fid, last_fid);
        if (diff > 0) {
                d->opd_pre_grow_count = OST_MIN_PRECREATE + diff;
                d->opd_pre_last_created_fid = d->opd_last_used_fid;
@@ -1031,13 +1020,13 @@ static int osp_precreate_timeout_condition(void *data)
 {
        struct osp_device *d = data;
 
-       LCONSOLE_WARN("%s: slow creates, last="DFID", next="DFID", "
-                     "reserved="LPU64", syn_changes=%lu, "
-                     "syn_rpc_in_progress=%d, status=%d\n",
-                     d->opd_obd->obd_name, PFID(&d->opd_pre_last_created_fid),
-                     PFID(&d->opd_pre_used_fid), d->opd_pre_reserved,
-                     d->opd_syn_changes, d->opd_syn_rpc_in_progress,
-                     d->opd_pre_status);
+       CDEBUG(D_HA, "%s: slow creates, last="DFID", next="DFID", "
+             "reserved="LPU64", syn_changes=%lu, "
+             "syn_rpc_in_progress=%d, status=%d\n",
+             d->opd_obd->obd_name, PFID(&d->opd_pre_last_created_fid),
+             PFID(&d->opd_pre_used_fid), d->opd_pre_reserved,
+             d->opd_syn_changes, d->opd_syn_rpc_in_progress,
+             d->opd_pre_status);
 
        return 1;
 }
@@ -1149,7 +1138,7 @@ int osp_precreate_get_fid(const struct lu_env *env, struct osp_device *d,
        /* grab next id from the pool */
        spin_lock(&d->opd_pre_lock);
 
-       LASSERTF(lu_fid_diff(&d->opd_pre_used_fid,
+       LASSERTF(osp_fid_diff(&d->opd_pre_used_fid,
                             &d->opd_pre_last_created_fid) < 0,
                 "next fid "DFID" last created fid "DFID"\n",
                 PFID(&d->opd_pre_used_fid),
@@ -1289,7 +1278,7 @@ int osp_init_precreate(struct osp_device *d)
         * start thread handling precreation and statfs updates
         */
        task = kthread_run(osp_precreate_thread, d,
-                              "osp-pre-%u", d->opd_index);
+                          "osp-pre-%u-%u", d->opd_index, d->opd_group);
        if (IS_ERR(task)) {
                CERROR("can't start precreate thread %ld\n", PTR_ERR(task));
                RETURN(PTR_ERR(task));