LU-7346 tests: Reintroduce SLOW tests to review process

[fs/lustre-release.git] / lustre / target / tgt_lastrcvd.c

diff --git a/lustre/target/tgt_lastrcvd.c b/lustre/target/tgt_lastrcvd.c
index 0c9cc87..74e28f8 100644 (file)
--- a/lustre/target/tgt_lastrcvd.c
+++ b/lustre/target/tgt_lastrcvd.c
@@ -308,7 +308,7 @@ static void tgt_free_reply_data(struct lu_target *lut,
 {
        CDEBUG(D_TRACE, "%s: free reply data %p: xid %llu, transno %llu, "
               "client gen %u, slot idx %d\n",
-              tgt_name(lut), trd, trd->trd_reply.lrd_xid,
+              lut == NULL ? "" : tgt_name(lut), trd, trd->trd_reply.lrd_xid,
               trd->trd_reply.lrd_transno, trd->trd_reply.lrd_client_gen,
               trd->trd_index);
 
@@ -316,7 +316,8 @@ static void tgt_free_reply_data(struct lu_target *lut,
 
        list_del(&trd->trd_list);
        ted->ted_reply_cnt--;
-       tgt_clear_reply_slot(lut, trd->trd_index);
+       if (lut != NULL)
+               tgt_clear_reply_slot(lut, trd->trd_index);
        OBD_FREE_PTR(trd);
 }
 
@@ -331,7 +332,7 @@ static void tgt_release_reply_data(struct lu_target *lut,
 {
        CDEBUG(D_TRACE, "%s: release reply data %p: xid %llu, transno %llu, "
               "client gen %u, slot idx %d\n",
-              tgt_name(lut), trd, trd->trd_reply.lrd_xid,
+              lut == NULL ? "" : tgt_name(lut), trd, trd->trd_reply.lrd_xid,
               trd->trd_reply.lrd_transno, trd->trd_reply.lrd_client_gen,
               trd->trd_index);
 
@@ -418,9 +419,12 @@ void tgt_client_free(struct obd_export *exp)
        OBD_FREE_PTR(ted->ted_lcd);
        ted->ted_lcd = NULL;
 
-       /* Slot may be not yet assigned */
-       if (ted->ted_lr_idx < 0)
+       /* Target may have been freed (see LU-7430)
+        * Slot may be not yet assigned */
+       if (exp->exp_obd->u.obt.obt_magic != OBT_MAGIC ||
+           ted->ted_lr_idx < 0)
                return;
+
        /* Clear bit when lcd is freed */
        LASSERT(lut && lut->lut_client_bitmap);
        if (!test_and_clear_bit(ted->ted_lr_idx, lut->lut_client_bitmap)) {
@@ -745,7 +749,7 @@ void tgt_boot_epoch_update(struct lu_target *tgt)
 }
 
 /**
- * commit callback, need to update last_commited value
+ * commit callback, need to update last_committed value
  */
 struct tgt_last_committed_callback {
        struct dt_txn_commit_cb  llcc_cb;
@@ -777,7 +781,9 @@ static void tgt_cb_last_committed(struct lu_env *env, struct thandle *th,
        if (ccb->llcc_transno > ccb->llcc_exp->exp_last_committed) {
                ccb->llcc_exp->exp_last_committed = ccb->llcc_transno;
                spin_unlock(&ccb->llcc_tgt->lut_translock);
+
                ptlrpc_commit_replies(ccb->llcc_exp);
+               tgt_cancel_slc_locks(ccb->llcc_transno);
        } else {
                spin_unlock(&ccb->llcc_tgt->lut_translock);
        }
@@ -1723,8 +1729,15 @@ int tgt_txn_start_cb(const struct lu_env *env, struct thandle *th,
                return rc;
 
        if (tgt_is_multimodrpcs_client(tsi->tsi_exp)) {
-               tti->tti_off = atomic_read(&tgt->lut_num_clients) * 8
-                               * sizeof(struct lsd_reply_data);
+               /*
+                * Use maximum possible file offset for declaration to ensure
+                * ZFS will reserve enough credits for a write anywhere in this
+                * file, since we don't know where in the file the write will be
+                * because a replay slot has not been assigned.  This should be
+                * replaced by dmu_tx_hold_append() when available.
+                */
+               tti->tti_off = atomic_read(&tgt->lut_num_clients) * 8 *
+                               sizeof(struct lsd_reply_data);
                tti->tti_buf.lb_buf = NULL;
                tti->tti_buf.lb_len = sizeof(struct lsd_reply_data);
                dto = dt_object_locate(tgt->lut_reply_data, th->th_dev);