Branch HEAD

[fs/lustre-release.git] / lustre / osc / osc_create.c

diff --git a/lustre/osc/osc_create.c b/lustre/osc/osc_create.c
index 39cea5a..a851c35 100644 (file)
--- a/lustre/osc/osc_create.c
+++ b/lustre/osc/osc_create.c
@@ -85,11 +85,26 @@ static int osc_interpret_create(const struct lu_env *env,
                 if (body) {
                         int diff = body->oa.o_id - oscc->oscc_last_id;
 
-                        if (diff < oscc->oscc_grow_count)
-                                oscc->oscc_grow_count =
-                                        max(diff/3, OST_MIN_PRECREATE);
-                        else
+                        /* oscc_internal_create() stores the original value of
+                         * grow_count in rq_async_args.space[0].
+                         * We can't compare against oscc_grow_count directly,
+                         * because it may have been increased while the RPC
+                         * is in flight, so we would always find ourselves
+                         * having created fewer objects and decreasing the
+                         * precreate request size.  b=18577 */
+                        if (diff < (int) req->rq_async_args.space[0]) {
+                                /* the OST has not managed to create all the
+                                 * objects we asked for */
+                                oscc->oscc_grow_count = max(diff,
+                                                            OST_MIN_PRECREATE);
+                                /* don't bump grow_count next time */
+                                oscc->oscc_flags |= OSCC_FLAG_LOW;
+                        } else {
+                                /* the OST is able to keep up with the work,
+                                 * we could consider increasing grow_count
+                                 * next time if needed */
                                 oscc->oscc_flags &= ~OSCC_FLAG_LOW;
+                        }
                         oscc->oscc_last_id = body->oa.o_id;
                 }
                 spin_unlock(&oscc->oscc_lock);
@@ -186,6 +201,7 @@ static int oscc_internal_create(struct osc_creator *oscc)
         body->oa.o_gr = oscc->oscc_oa.o_gr;
         LASSERT_MDS_GROUP(body->oa.o_gr);
         body->oa.o_valid |= OBD_MD_FLID | OBD_MD_FLGROUP;
+        request->rq_async_args.space[0] = oscc->oscc_grow_count;
         spin_unlock(&oscc->oscc_lock);
         CDEBUG(D_RPCTRACE, "prealloc through id "LPU64" (last seen "LPU64")\n",
                body->oa.o_id, oscc->oscc_last_id);
@@ -286,16 +302,14 @@ int osc_precreate(struct obd_export *exp)
         if (oscc_recovering(oscc))
                 RETURN(2);
 
+        if (oscc->oscc_flags & OSCC_FLAG_NOSPC)
+                RETURN(1000);
+
         if (oscc->oscc_last_id < oscc->oscc_next_id) {
-                spin_lock(&oscc->oscc_lock);
-                if (oscc->oscc_flags & OSCC_FLAG_NOSPC) {
-                        spin_unlock(&oscc->oscc_lock);
-                        RETURN(1000);
-                }
-                if (oscc->oscc_flags & OSCC_FLAG_SYNC_IN_PROGRESS) {
-                        spin_unlock(&oscc->oscc_lock);
+                if (oscc->oscc_flags & OSCC_FLAG_SYNC_IN_PROGRESS)
                         RETURN(1);
-                }
+
+                spin_lock(&oscc->oscc_lock);
                 if (oscc->oscc_flags & OSCC_FLAG_CREATING) {
                         spin_unlock(&oscc->oscc_lock);
                         RETURN(1);
@@ -311,6 +325,7 @@ int osc_create(struct obd_export *exp, struct obdo *oa,
                struct lov_stripe_md **ea, struct obd_trans_info *oti)
 {
         struct osc_creator *oscc = &exp->exp_obd->u.cli.cl_oscc;
+        struct obd_import  *imp  = exp->exp_obd->u.cli.cl_import;
         struct lov_stripe_md *lsm;
         int try_again = 1, rc = 0;
         ENTRY;
@@ -357,10 +372,23 @@ int osc_create(struct obd_export *exp, struct obdo *oa,
                 spin_lock(&oscc->oscc_lock);
                 oscc->oscc_flags &= ~OSCC_FLAG_SYNC_IN_PROGRESS;
                 if (rc == 0 || rc == -ENOSPC) {
+                        struct obd_connect_data *ocd;
+
                         if (rc == -ENOSPC)
                                 oscc->oscc_flags |= OSCC_FLAG_NOSPC;
                         oscc->oscc_flags &= ~OSCC_FLAG_RECOVERING;
+
                         oscc->oscc_last_id = oa->o_id;
+                        ocd = &imp->imp_connect_data;
+                        if (ocd->ocd_connect_flags & OBD_CONNECT_SKIP_ORPHAN) {
+                                CDEBUG(D_HA, "%s: Skip orphan set, reset last "
+                                       "objid\n", oscc->oscc_obd->obd_name);
+                                oscc->oscc_next_id = oa->o_id + 1;
+                        }
+
+                        /* sanity check for next objid. see bug 17025 */
+                        LASSERT(oscc->oscc_next_id == oa->o_id + 1);
+
                         CDEBUG(D_HA, "%s: oscc recovery finished, last_id: "
                                LPU64", rc: %d\n", oscc->oscc_obd->obd_name,
                                oscc->oscc_last_id, rc);