* GPL HEADER END
*/
/*
- * Copyright (c) 2014, 2015, Intel Corporation.
+ * Copyright (c) 2015, 2017, Intel Corporation.
*/
/*
* lustre/target/update_trans.c
struct sub_thandle *st;
LASSERT(tmt->tmt_magic == TOP_THANDLE_MAGIC);
- CDEBUG(mask, "%s tmt %p refcount %d committed %d result %d "
- "batchid "LPU64"\n",
+ CDEBUG(mask, "%s tmt %p refcount %d committed %d result %d batchid %llu\n",
tmt->tmt_master_sub_dt ?
tmt->tmt_master_sub_dt->dd_lu_dev.ld_obd->obd_name :
"NULL",
list_for_each_entry(st, &tmt->tmt_sub_thandle_list, st_sub_list) {
struct sub_thandle_cookie *stc;
- CDEBUG(mask, "st %p obd %s committed %d stopped %d sub_th %p\n",
+ CDEBUG(mask, "st %p obd %s committed %d started %d stopped %d "
+ "result %d sub_th %p\n",
st, st->st_dt->dd_lu_dev.ld_obd->obd_name,
- st->st_committed, st->st_stopped, st->st_sub_th);
+ st->st_committed, st->st_started, st->st_stopped,
+ st->st_result, st->st_sub_th);
list_for_each_entry(stc, &st->st_cookie_list, stc_list) {
- CDEBUG(mask, " cookie "DOSTID": %u\n",
- POSTID(&stc->stc_cookie.lgc_lgl.lgl_oi),
+ CDEBUG(mask, " cookie "DFID".%u\n",
+ PFID(&stc->stc_cookie.lgc_lgl.lgl_oi.oi_fid),
stc->stc_cookie.lgc_index);
}
}
"lrh_len %u record_size %zu\n", record->lur_hdr.lrh_len,
llog_update_record_size(record));
- if (likely(record->lur_hdr.lrh_len <= ctxt->loc_chunk_size)) {
+ /*
+ * If its size > llog chunk_size, then write current chunk to the update
+ * llog, NB the padding should >= LLOG_MIN_REC_SIZE.
+ *
+ * So check padding length is either >= LLOG_MIN_REC_SIZE or is 0
+ * (record length just matches the chunk size).
+ */
+
+ reclen = record->lur_hdr.lrh_len;
+ if (reclen + LLOG_MIN_REC_SIZE <= ctxt->loc_chunk_size ||
+ reclen == ctxt->loc_chunk_size) {
OBD_ALLOC_PTR(stc);
if (stc == NULL)
GOTO(llog_put, rc = -ENOMEM);
rc = llog_add(env, ctxt->loc_handle, &record->lur_hdr,
&stc->stc_cookie, sub_th->st_sub_th);
- CDEBUG(D_INFO, "%s: Add update log "DOSTID":%u: rc = %d\n",
+ CDEBUG(D_INFO, "%s: Add update log "DFID".%u: rc = %d\n",
dt->dd_lu_dev.ld_obd->obd_name,
- POSTID(&stc->stc_cookie.lgc_lgl.lgl_oi),
+ PFID(&stc->stc_cookie.lgc_lgl.lgl_oi.oi_fid),
stc->stc_cookie.lgc_index, rc);
if (rc > 0) {
else
eof = true;
- /*
- * If its size > llog chunk_size, then write current chunk to
- * the update llog, NB the padding should >= LLOG_MIN_REC_SIZE.
- *
- * So check padding length is either >= LLOG_MIN_REC_SIZE or is
- * 0 (record length just matches the chunk size).
- */
reclen = __llog_update_record_size(
__update_records_size(next - start));
if ((reclen + LLOG_MIN_REC_SIZE <= ctxt->loc_chunk_size ||
rc = llog_add(env, ctxt->loc_handle, &lur->lur_hdr,
&stc->stc_cookie, sub_th->st_sub_th);
- CDEBUG(D_INFO, "%s: Add update log "DOSTID":%u rc = %d\n",
+ CDEBUG(D_INFO, "%s: Add update log "DFID".%u: rc = %d\n",
dt->dd_lu_dev.ld_obd->obd_name,
- POSTID(&stc->stc_cookie.lgc_lgl.lgl_oi),
+ PFID(&stc->stc_cookie.lgc_lgl.lgl_oi.oi_fid),
stc->stc_cookie.lgc_index, rc);
if (rc > 0) {
struct top_multiple_thandle *tmt = cb->dcb_data;
ENTRY;
+ spin_lock(&tmt->tmt_sub_lock);
list_for_each_entry(st, &tmt->tmt_sub_thandle_list, st_sub_list) {
if (st->st_stopped)
continue;
break;
}
}
+ spin_unlock(&tmt->tmt_sub_lock);
wake_up(&tmt->tmt_stop_waitq);
RETURN_EXIT;
child_th->th_top = &top_th->tt_super;
child_th->th_wait_submit = 1;
top_th->tt_master_sub_thandle = child_th;
-
- top_th->tt_super.th_tags |= child_th->th_tags;
}
return &top_th->tt_super;
}
top_th->tt_master_sub_thandle->th_sync = th->th_sync;
if (th->th_local)
top_th->tt_master_sub_thandle->th_local = th->th_local;
- top_th->tt_master_sub_thandle->th_tags = th->th_tags;
rc = dt_trans_start(env, top_th->tt_master_sub_thandle->th_dev,
top_th->tt_master_sub_thandle);
RETURN(rc);
st->st_sub_th->th_sync = th->th_sync;
if (th->th_local)
st->st_sub_th->th_local = th->th_local;
- st->st_sub_th->th_tags = th->th_tags;
rc = dt_trans_start(env, st->st_sub_th->th_dev,
st->st_sub_th);
if (rc != 0)
top_th->tt_master_sub_thandle->th_sync = th->th_sync;
if (th->th_local)
top_th->tt_master_sub_thandle->th_local = th->th_local;
- top_th->tt_master_sub_thandle->th_tags = th->th_tags;
rc = dt_trans_stop(env, master_dev,
top_th->tt_master_sub_thandle);
OBD_FREE_PTR(top_th);
master_st->st_sub_th->th_local = th->th_local;
if (th->th_sync)
master_st->st_sub_th->th_sync = th->th_sync;
- master_st->st_sub_th->th_tags = th->th_tags;
master_st->st_sub_th->th_result = th->th_result;
rc = dt_trans_stop(env, master_st->st_dt, master_st->st_sub_th);
/* If it does not write_updates, then we call submit callback
sub_trans_commit_cb_internal(tmt,
master_st->st_sub_th, rc);
if (rc < 0) {
+ CERROR("%s: stop trans failed: rc = %d\n",
+ master_dev->dd_lu_dev.ld_obd->obd_name, rc);
th->th_result = rc;
GOTO(stop_other_trans, rc);
} else if (tur != NULL && tur->tur_update_records != NULL) {
rc = sub_updates_write(env, lur, st);
if (rc < 0) {
+ CERROR("%s: write updates failed: rc = %d\n",
+ st->st_dt->dd_lu_dev.ld_obd->obd_name,
+ rc);
th->th_result = rc;
break;
}
st->st_sub_th->th_sync = th->th_sync;
if (th->th_local)
st->st_sub_th->th_local = th->th_local;
- st->st_sub_th->th_tags = th->th_tags;
st->st_sub_th->th_result = th->th_result;
rc = dt_trans_stop(env, st->st_sub_th->th_dev,
st->st_sub_th);
- if (unlikely(rc < 0 && th->th_result == 0))
- th->th_result = rc;
+ if (rc < 0) {
+ CERROR("%s: stop trans failed: rc = %d\n",
+ st->st_dt->dd_lu_dev.ld_obd->obd_name, rc);
+ if (th->th_result == 0)
+ th->th_result = rc;
+ }
}
rc = top_trans_wait_result(top_th);
rc = llog_cat_cancel_records(env, ctxt->loc_handle, 1,
cookie);
CDEBUG(D_HA, "%s: batchid %llu cancel update log "
- DOSTID ".%u : rc = %d\n", obd->obd_name,
+ DFID".%u: rc = %d\n", obd->obd_name,
tmt->tmt_batchid,
- POSTID(&cookie->lgc_lgl.lgl_oi),
+ PFID(&cookie->lgc_lgl.lgl_oi.oi_fid),
cookie->lgc_index, rc);
}
th = dt_trans_create(env, tdtd->tdtd_lut->lut_bottom);
if (IS_ERR(th)) {
+ atomic_dec(&tdtd->tdtd_refcount);
OBD_FREE_PTR(dtbd);
RETURN(PTR_ERR(th));
}
rc = dt_record_write(env, tdtd->tdtd_batchid_obj, &buf,
&off, th);
- CDEBUG(D_INFO, "%s: update batchid "LPU64": rc = %d\n",
+ CDEBUG(D_INFO, "%s: update batchid %llu: rc = %d\n",
tdtd->tdtd_lut->lut_obd->obd_name, batchid, rc);
stop:
dt_trans_stop(env, tdtd->tdtd_lut->lut_bottom, th);
- if (rc < 0)
+ if (rc < 0) {
+ atomic_dec(&tdtd->tdtd_refcount);
OBD_FREE_PTR(dtbd);
+ }
RETURN(rc);
}
out_put:
if (rc < 0 && dt_obj != NULL) {
- lu_object_put(env, &dt_obj->do_lu);
+ dt_object_put(env, dt_obj);
tdtd->tdtd_batchid_obj = NULL;
}
return rc;
wake_up(&thread->t_ctl_waitq);
INIT_LIST_HEAD(&list);
- CDEBUG(D_HA, "%s: start commit thread committed batchid "LPU64"\n",
+ CDEBUG(D_HA, "%s: start commit thread committed batchid %llu\n",
tdtd->tdtd_lut->lut_obd->obd_name,
tdtd->tdtd_committed_batchid);
list_move_tail(&tmt->tmt_commit_list, &list);
} else if (!tdtd->tdtd_lut->lut_obd->obd_recovering) {
LASSERTF(tmt->tmt_batchid >= batchid,
- "tmt %p tmt_batchid: "LPU64", batchid "
- LPU64"\n", tmt, tmt->tmt_batchid,
+ "tmt %p tmt_batchid: %llu, batchid "
+ "%llu\n", tmt, tmt->tmt_batchid,
batchid);
/* There are three types of distribution
* transaction result
}
spin_unlock(&tdtd->tdtd_batchid_lock);
- CDEBUG(D_HA, "%s: batchid: "LPU64" committed batchid "
- LPU64"\n", tdtd->tdtd_lut->lut_obd->obd_name, batchid,
+ CDEBUG(D_HA, "%s: batchid: %llu committed batchid "
+ "%llu\n", tdtd->tdtd_lut->lut_obd->obd_name, batchid,
tdtd->tdtd_committed_batchid);
/* update globally committed on a storage */
if (batchid > tdtd->tdtd_committed_batchid) {
atomic_set(&tdtd->tdtd_recovery_threads_count, 0);
tdtd->tdtd_lut = lut;
+ if (lut->lut_bottom->dd_rdonly)
+ RETURN(0);
+
rc = distribute_txn_commit_batchid_init(env, tdtd);
if (rc != 0)
RETURN(rc);
- task = kthread_run(distribute_txn_commit_thread, tdtd, "tdtd-%u",
+ task = kthread_run(distribute_txn_commit_thread, tdtd, "dist_txn-%u",
index);
if (IS_ERR(task))
RETURN(PTR_ERR(task));
dtrq_list_destroy(tdtd);
if (tdtd->tdtd_batchid_obj != NULL) {
- lu_object_put(env, &tdtd->tdtd_batchid_obj->do_lu);
+ dt_object_put(env, tdtd->tdtd_batchid_obj);
tdtd->tdtd_batchid_obj = NULL;
}
}