LU-13408 target: update in-memory per client data

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

diff --git a/lustre/target/tgt_lastrcvd.c b/lustre/target/tgt_lastrcvd.c
index 8961215..061f088 100644 (file)
--- a/lustre/target/tgt_lastrcvd.c
+++ b/lustre/target/tgt_lastrcvd.c
@@ -529,7 +529,7 @@ static void tgt_cb_new_client(struct lu_env *env, struct thandle *th,
 {
        struct tgt_new_client_callback *ccb;
 
-       ccb = container_of0(cb, struct tgt_new_client_callback, lncc_cb);
+       ccb = container_of(cb, struct tgt_new_client_callback, lncc_cb);
 
        LASSERT(ccb->lncc_exp->exp_obd);
 
@@ -867,7 +867,7 @@ static void tgt_cb_last_committed(struct lu_env *env, struct thandle *th,
 {
        struct tgt_last_committed_callback *ccb;
 
-       ccb = container_of0(cb, struct tgt_last_committed_callback, llcc_cb);
+       ccb = container_of(cb, struct tgt_last_committed_callback, llcc_cb);
 
        LASSERT(ccb->llcc_exp);
        LASSERT(ccb->llcc_tgt != NULL);
@@ -1200,6 +1200,7 @@ static int tgt_add_reply_data(const struct lu_env *env, struct lu_target *tgt,
 {
        struct lsd_reply_data   *lrd;
        int     i;
+       int     rc;
 
        lrd = &trd->trd_reply;
        /* update export last transno */
@@ -1220,7 +1221,6 @@ static int tgt_add_reply_data(const struct lu_env *env, struct lu_target *tgt,
 
                if (update_lrd_file) {
                        loff_t  off;
-                       int     rc;
 
                        /* write reply data to disk */
                        off = sizeof(struct lsd_reply_header) + sizeof(*lrd) * i;
@@ -1228,7 +1228,7 @@ static int tgt_add_reply_data(const struct lu_env *env, struct lu_target *tgt,
                        if (unlikely(rc != 0)) {
                                CERROR("%s: can't update %s file: rc = %d\n",
                                       tgt_name(tgt), REPLY_DATA, rc);
-                               RETURN(rc);
+                               GOTO(free_slot, rc);
                        }
                }
        } else {
@@ -1242,8 +1242,12 @@ static int tgt_add_reply_data(const struct lu_env *env, struct lu_target *tgt,
                              MSG_REPLAY : MSG_REPLAY|MSG_RESENT;
 
                if (req->rq_obsolete) {
+                       CDEBUG(D_INFO,
+                              "drop reply data update for obsolete req xid=%llu,"
+                              "transno=%llu, tag=%hu\n", req->rq_xid,
+                              lrd->lrd_transno, trd->trd_tag);
                        mutex_unlock(&ted->ted_lcd_lock);
-                       RETURN(-EALREADY);
+                       GOTO(free_slot, rc = -EBADR);
                }
 
                if (!(lustre_msg_get_flags(req->rq_reqmsg) & exclude))
@@ -1262,6 +1266,11 @@ static int tgt_add_reply_data(const struct lu_env *env, struct lu_target *tgt,
               trd->trd_tag, lrd->lrd_client_gen, trd->trd_index);
 
        RETURN(0);
+
+free_slot:
+       if (tgt != NULL)
+               tgt_clear_reply_slot(tgt, trd->trd_index);
+       return rc;
 }
 
 int tgt_mk_reply_data(const struct lu_env *env,
@@ -1315,8 +1324,11 @@ int tgt_mk_reply_data(const struct lu_env *env,
 
        rc = tgt_add_reply_data(env, tgt, ted, trd, req,
                                th, write_update);
-       if (rc < 0)
+       if (rc < 0) {
                OBD_FREE_PTR(trd);
+               if (rc == -EBADR)
+                       rc = 0;
+       }
        return rc;
 
 }
@@ -1331,11 +1343,11 @@ static int tgt_last_rcvd_update(const struct lu_env *env, struct lu_target *tgt,
 {
        struct tgt_thread_info  *tti = tgt_th_info(env);
        struct tgt_session_info *tsi = tgt_ses_info(env);
-       struct obd_export       *exp = tsi->tsi_exp;
-       struct tg_export_data   *ted;
-       __u64                   *transno_p;
-       int                      rc = 0;
-       bool                     lw_client;
+       struct obd_export *exp = tsi->tsi_exp;
+       struct tg_export_data *ted;
+       __u64 *transno_p;
+       bool nolcd = false;
+       int rc = 0;
 
        ENTRY;
 
@@ -1343,11 +1355,15 @@ static int tgt_last_rcvd_update(const struct lu_env *env, struct lu_target *tgt,
        LASSERT(exp != NULL);
        ted = &exp->exp_target_data;
 
-       lw_client = exp_connect_flags(exp) & OBD_CONNECT_LIGHTWEIGHT;
-       if (ted->ted_lr_idx < 0 && !lw_client)
-               /* ofd connect may cause transaction before export has
-                * last_rcvd slot */
-               RETURN(0);
+       /* Some clients don't support recovery, and they don't have last_rcvd
+        * client data:
+        * 1. lightweight clients.
+        * 2. local clients on MDS which doesn't enable "localrecov".
+        * 3. OFD connect may cause transaction before export has last_rcvd
+        *    slot.
+        */
+       if (ted->ted_lr_idx < 0)
+               nolcd = true;
 
        if (req != NULL)
                tti->tti_transno = lustre_msg_get_transno(req->rq_reqmsg);
@@ -1388,14 +1404,13 @@ static int tgt_last_rcvd_update(const struct lu_env *env, struct lu_target *tgt,
        /* if can't add callback, do sync write */
        th->th_sync |= !!tgt_last_commit_cb_add(th, tgt, exp, tti->tti_transno);
 
-       if (lw_client) {
-               /* All operations performed by LW clients are synchronous and
-                * we store the committed transno in the last_rcvd header */
+       if (nolcd) {
+               /* store transno in the last_rcvd header */
                spin_lock(&tgt->lut_translock);
                if (tti->tti_transno > tgt->lut_lsd.lsd_last_transno) {
                        tgt->lut_lsd.lsd_last_transno = tti->tti_transno;
                        spin_unlock(&tgt->lut_translock);
-                       /* Although lightweight (LW) connections have no slot
+                       /* Although current connection doesn't have slot
                         * in the last_rcvd, we still want to maintain
                         * the in-memory lsd_client_data structure in order to
                         * properly handle reply reconstruction. */
@@ -1468,7 +1483,7 @@ static int tgt_last_rcvd_update(const struct lu_env *env, struct lu_target *tgt,
                }
        }
 
-       if (!lw_client) {
+       if (!nolcd) {
                tti->tti_off = ted->ted_lr_off;
                if (CFS_FAIL_CHECK(OBD_FAIL_TGT_RCVD_EIO))
                        rc = -EIO;