/*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011 Whamcloud, Inc.
+ *
*/
/*
* This file is part of Lustre, http://www.lustre.org/
mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
p = &mti->mti_txn_param;
- /* export can require sync operations */
- if (mti->mti_exp != NULL)
- p->tp_sync = mti->mti_exp->exp_need_sync;
-
- return mdt->mdt_bottom->dd_ops->dt_trans_start(env, mdt->mdt_bottom, p);
+ return dt_trans_start(env, mdt->mdt_bottom, p);
}
void mdt_trans_stop(const struct lu_env *env,
struct mdt_device *mdt, struct thandle *th)
{
- mdt->mdt_bottom->dd_ops->dt_trans_stop(env, th);
+ struct mdt_thread_info *mti;
+
+ mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
+ /* export can require sync operations */
+ if (mti->mti_exp != NULL)
+ th->th_sync |= mti->mti_exp->exp_need_sync;
+ dt_trans_stop(env, mdt->mdt_bottom, th);
}
static inline int mdt_last_rcvd_header_read(const struct lu_env *env,
cfs_spin_unlock(&mdt->mdt_lut.lut_translock);
obd->u.obt.obt_mount_count = mount_count + 1;
+ obd->u.obt.obt_instance = (__u32)obd->u.obt.obt_mount_count;
lsd->lsd_mount_count = obd->u.obt.obt_mount_count;
/* save it, so mount count and last_transno is current */
* transaction so that many connecting clients will not bring
* server down with lots of sync writes.
*/
- mdt_trans_add_cb(th, lut_cb_client, class_export_cb_get(mti->mti_exp));
- cfs_spin_lock(&mti->mti_exp->exp_lock);
- mti->mti_exp->exp_need_sync = 1;
- cfs_spin_unlock(&mti->mti_exp->exp_lock);
+ rc = lut_new_client_cb_add(th, mti->mti_exp);
+ if (rc) {
+ /* can't add callback, do sync now */
+ th->th_sync = 1;
+ } else {
+ cfs_spin_lock(&mti->mti_exp->exp_lock);
+ mti->mti_exp->exp_need_sync = 1;
+ cfs_spin_unlock(&mti->mti_exp->exp_lock);
+ }
rc = mdt_last_rcvd_write(env, mdt, ted->ted_lcd, &off, th);
CDEBUG(D_INFO, "wrote client lcd at idx %u off %llu (len %u)\n",
lustre_msg_get_opc(req->rq_reqmsg) == MDS_DONE_WRITING) {
if (mti->mti_transno != 0) {
if (lcd->lcd_last_close_transno > mti->mti_transno) {
- LASSERT(req_is_replay(req));
CERROR("Trying to overwrite bigger transno:"
- "on-disk: "LPU64", new: "LPU64"\n",
+ "on-disk: "LPU64", new: "LPU64" "
+ "replay: %d. see LU-617.\n",
lcd->lcd_last_close_transno,
- mti->mti_transno);
- cfs_spin_lock(&req->rq_export->exp_lock);
- req->rq_export->exp_vbr_failed = 1;
- cfs_spin_unlock(&req->rq_export->exp_lock);
+ mti->mti_transno, req_is_replay(req));
+ if (req_is_replay(req)) {
+ cfs_spin_lock(&req->rq_export->exp_lock);
+ req->rq_export->exp_vbr_failed = 1;
+ cfs_spin_unlock(&req->rq_export->exp_lock);
+ }
cfs_mutex_up(&ted->ted_lcd_lock);
- RETURN(-EOVERFLOW);
+ RETURN(req_is_replay(req) ? -EOVERFLOW : 0);
}
lcd->lcd_last_close_transno = mti->mti_transno;
}
}
if (mti->mti_transno != 0) {
if (lcd->lcd_last_transno > mti->mti_transno) {
- LASSERT(req_is_replay(req));
CERROR("Trying to overwrite bigger transno:"
- "on-disk: "LPU64", new: "LPU64"\n",
+ "on-disk: "LPU64", new: "LPU64" "
+ "replay: %d. see LU-617.\n",
lcd->lcd_last_transno,
- mti->mti_transno);
- cfs_spin_lock(&req->rq_export->exp_lock);
- req->rq_export->exp_vbr_failed = 1;
- cfs_spin_unlock(&req->rq_export->exp_lock);
+ mti->mti_transno, req_is_replay(req));
+ if (req_is_replay(req)) {
+ cfs_spin_lock(&req->rq_export->exp_lock);
+ req->rq_export->exp_vbr_failed = 1;
+ cfs_spin_unlock(&req->rq_export->exp_lock);
+ }
cfs_mutex_up(&ted->ted_lcd_lock);
- RETURN(-EOVERFLOW);
+ RETURN(req_is_replay(req) ? -EOVERFLOW : 0);
}
lcd->lcd_last_transno = mti->mti_transno;
}
struct thandle *txn, void *cookie)
{
struct mdt_device *mdt = cookie;
- struct mdt_txn_info *txi;
struct mdt_thread_info *mti;
struct ptlrpc_request *req;
- /* transno in two contexts - for commit_cb and for thread */
- txi = lu_context_key_get(&txn->th_ctx, &mdt_txn_key);
mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
req = mdt_info_req(mti);
if (mti->mti_mdt == NULL || req == NULL || mti->mti_no_need_trans) {
- txi->txi_transno = 0;
mti->mti_no_need_trans = 0;
return 0;
}
req->rq_transno = mti->mti_transno;
lustre_msg_set_transno(req->rq_repmsg, mti->mti_transno);
- /* save transno for the commit callback */
- txi->txi_transno = mti->mti_transno;
-
- /* add separate commit callback for transaction handling because we need
- * export as parameter */
- mdt_trans_add_cb(txn, lut_cb_last_committed,
- class_export_cb_get(mti->mti_exp));
-
+ /* if can't add callback, do sync write */
+ txn->th_sync = !!lut_last_commit_cb_add(txn, &mdt->mdt_lut,
+ mti->mti_exp,
+ mti->mti_transno);
return mdt_last_rcvd_update(mti, txn);
}
-/* commit callback, need to update last_committed value */
-static int mdt_txn_commit_cb(const struct lu_env *env,
- struct thandle *txn, void *cookie)
-{
- struct mdt_device *mdt = cookie;
- struct mdt_txn_info *txi;
- int i;
-
- txi = lu_context_key_get(&txn->th_ctx, &mdt_txn_key);
-
- /* iterate through all additional callbacks */
- for (i = 0; i < txi->txi_cb_count; i++) {
- txi->txi_cb[i].lut_cb_func(&mdt->mdt_lut, txi->txi_transno,
- txi->txi_cb[i].lut_cb_data, 0);
- }
- return 0;
-}
-
int mdt_fs_setup(const struct lu_env *env, struct mdt_device *mdt,
struct obd_device *obd,
struct lustre_sb_info *lsi)
/* prepare transactions callbacks */
mdt->mdt_txn_cb.dtc_txn_start = mdt_txn_start_cb;
mdt->mdt_txn_cb.dtc_txn_stop = mdt_txn_stop_cb;
- mdt->mdt_txn_cb.dtc_txn_commit = mdt_txn_commit_cb;
+ mdt->mdt_txn_cb.dtc_txn_commit = NULL;
mdt->mdt_txn_cb.dtc_cookie = mdt;
mdt->mdt_txn_cb.dtc_tag = LCT_MD_THREAD;
CFS_INIT_LIST_HEAD(&mdt->mdt_txn_cb.dtc_linkage);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff