LU-8686 osd: add few more credits if debugging is enabled

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

diff --git a/lustre/osp/osp_trans.c b/lustre/osp/osp_trans.c
index c9c15c0..ebecd8a 100644 (file)
--- a/lustre/osp/osp_trans.c
+++ b/lustre/osp/osp_trans.c
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2014, 2015, Intel Corporation.
+ * Copyright (c) 2014, 2016, Intel Corporation.
  */
 /*
  * lustre/osp/osp_trans.c
@@ -264,7 +264,7 @@ object_update_request_dump(const struct object_update_request *ourq,
                update = object_update_request_get(ourq, i, &size);
                LASSERT(update != NULL);
                CDEBUG(mask, "i = %u fid = "DFID" op = %s "
-                      "params = %d batchid = "LPU64" size = %zu repsize %u\n",
+                      "params = %d batchid = %llu size = %zu repsize %u\n",
                       i, PFID(&update->ou_fid),
                       update_op_str(update->ou_type),
                       update->ou_params_count,
@@ -1045,7 +1045,7 @@ static void osp_request_commit_cb(struct ptlrpc_request *req)
                last_committed_transno =
                        req->rq_import->imp_peer_committed_transno;
 
-       CDEBUG(D_HA, "trans no "LPU64" committed transno "LPU64"\n",
+       CDEBUG(D_HA, "trans no %llu committed transno %llu\n",
               req->rq_transno, last_committed_transno);
 
        /* If the transaction is not really committed, mark result = 1 */
@@ -1258,7 +1258,7 @@ struct thandle *osp_get_storage_thandle(const struct lu_env *env,
  *
  * Set the version for the transaction and add the request to
  * the sending list, then after transaction stop, the request
- * will be picked in the order of version, by sending thread.
+ * will be sent in the order of version by the sending thread.
  *
  * \param [in] oth     osp thandle to be set version.
  *
@@ -1288,6 +1288,7 @@ int osp_check_and_set_rpc_version(struct osp_thandle *oth,
        /* Assign the version and add it to the sending list */
        osp_thandle_get(oth);
        oth->ot_our->our_version = ou->ou_version++;
+       oth->ot_our->our_generation = ou->ou_generation;
        list_add_tail(&oth->ot_our->our_list,
                      &osp->opd_update->ou_list);
        oth->ot_our->our_req_ready = 0;
@@ -1295,8 +1296,8 @@ int osp_check_and_set_rpc_version(struct osp_thandle *oth,
        spin_unlock(&ou->ou_lock);
 
        LASSERT(oth->ot_super.th_wait_submit == 1);
-       CDEBUG(D_INFO, "%s: version "LPU64" oth:version %p:"LPU64"\n",
-              osp->opd_obd->obd_name, ou->ou_version, oth,
+       CDEBUG(D_INFO, "%s: version %llu gen %llu oth:version %p:%llu\n",
+              osp->opd_obd->obd_name, ou->ou_version, ou->ou_generation, oth,
               oth->ot_our->our_version);
 
        return 0;
@@ -1325,7 +1326,7 @@ osp_get_next_request(struct osp_updates *ou, struct osp_update_request **ourp)
        spin_lock(&ou->ou_lock);
        list_for_each_entry_safe(our, tmp, &ou->ou_list, our_list) {
                LASSERT(our->our_th != NULL);
-               CDEBUG(D_HA, "ou %p version "LPU64" rpc_version "LPU64"\n",
+               CDEBUG(D_HA, "ou %p version %llu rpc_version %llu\n",
                       ou, our->our_version, ou->ou_rpc_version);
                spin_lock(&our->our_list_lock);
                /* Find next osp_update_request in the list */
@@ -1372,6 +1373,11 @@ void osp_invalidate_request(struct osp_device *osp)
        if (rc < 0) {
                CERROR("%s: init env error: rc = %d\n", osp->opd_obd->obd_name,
                       rc);
+
+               spin_lock(&ou->ou_lock);
+               ou->ou_generation++;
+               spin_unlock(&ou->ou_lock);
+
                return;
        }
 
@@ -1397,6 +1403,9 @@ void osp_invalidate_request(struct osp_device *osp)
                       our);
        }
 
+       /* Increase the generation, then the update request with old generation
+        * will fail with -EIO. */
+       ou->ou_generation++;
        spin_unlock(&ou->ou_lock);
 
        /* invalidate all of request in the sending list */
@@ -1464,7 +1473,8 @@ int osp_send_update_thread(void *arg)
                        osp_trans_callback(&env, our->our_th,
                                our->our_th->ot_super.th_result);
                        rc = our->our_th->ot_super.th_result;
-               } else if (OBD_FAIL_CHECK(OBD_FAIL_INVALIDATE_UPDATE)) {
+               } else if (ou->ou_generation != our->our_generation ||
+                          OBD_FAIL_CHECK(OBD_FAIL_INVALIDATE_UPDATE)) {
                        rc = -EIO;
                        osp_trans_callback(&env, our->our_th, rc);
                } else {
@@ -1577,7 +1587,7 @@ int osp_trans_stop(const struct lu_env *env, struct dt_device *dt,
                GOTO(out, rc = -EIO);
        }
 
-       CDEBUG(D_HA, "%s: add oth %p with version "LPU64"\n",
+       CDEBUG(D_HA, "%s: add oth %p with version %llu\n",
               osp->opd_obd->obd_name, oth, our->our_version);
 
        LASSERT(our->our_req_ready == 0);