* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
struct llog_handle *loghandle,
struct thandle *th)
{
-
+ struct llog_thread_info *lgi = llog_info(env);
+ struct llog_logid_rec *rec = &lgi->lgi_logid;
struct llog_log_hdr *llh;
- struct llog_logid_rec rec = { { 0 }, };
int rc, index, bitmap_size;
ENTRY;
cathandle->lgh_last_idx = index;
llh->llh_tail.lrt_index = index;
- CDEBUG(D_RPCTRACE,"new recovery log "LPX64":%x for index %u of catalog "
- LPX64"\n", loghandle->lgh_id.lgl_oid, loghandle->lgh_id.lgl_ogen,
- index, cathandle->lgh_id.lgl_oid);
- /* build the record for this log in the catalog */
- rec.lid_hdr.lrh_len = sizeof(rec);
- rec.lid_hdr.lrh_index = index;
- rec.lid_hdr.lrh_type = LLOG_LOGID_MAGIC;
- rec.lid_id = loghandle->lgh_id;
- rec.lid_tail.lrt_len = sizeof(rec);
- rec.lid_tail.lrt_index = index;
+ CDEBUG(D_RPCTRACE,"new recovery log "DOSTID":%x for index %u of catalog"
+ DOSTID"\n", POSTID(&loghandle->lgh_id.lgl_oi),
+ loghandle->lgh_id.lgl_ogen, index,
+ POSTID(&cathandle->lgh_id.lgl_oi));
+ /* build the record for this log in the catalog */
+ rec->lid_hdr.lrh_len = sizeof(*rec);
+ rec->lid_hdr.lrh_index = index;
+ rec->lid_hdr.lrh_type = LLOG_LOGID_MAGIC;
+ rec->lid_id = loghandle->lgh_id;
+ rec->lid_tail.lrt_len = sizeof(*rec);
+ rec->lid_tail.lrt_index = index;
/* update the catalog: header and record */
- rc = llog_write_rec(env, cathandle, &rec.lid_hdr,
+ rc = llog_write_rec(env, cathandle, &rec->lid_hdr,
&loghandle->u.phd.phd_cookie, 1, NULL, index, th);
if (rc < 0)
GOTO(out_destroy, rc);
u.phd.phd_entry) {
struct llog_logid *cgl = &loghandle->lgh_id;
- if (cgl->lgl_oid == logid->lgl_oid) {
+ if (ostid_id(&cgl->lgl_oi) == ostid_id(&logid->lgl_oi) &&
+ ostid_seq(&cgl->lgl_oi) == ostid_seq(&logid->lgl_oi)) {
if (cgl->lgl_ogen != logid->lgl_ogen) {
- CERROR("%s: log "LPX64" generation %x != %x\n",
+ CERROR("%s: log "DOSTID" generation %x != %x\n",
loghandle->lgh_ctxt->loc_obd->obd_name,
- logid->lgl_oid, cgl->lgl_ogen,
+ POSTID(&logid->lgl_oi), cgl->lgl_ogen,
logid->lgl_ogen);
continue;
}
rc = llog_open(env, cathandle->lgh_ctxt, &loghandle, logid, NULL,
LLOG_OPEN_EXISTS);
if (rc < 0) {
- CERROR("%s: error opening log id "LPX64":%x: rc = %d\n",
+ CERROR("%s: error opening log id "DOSTID":%x: rc = %d\n",
cathandle->lgh_ctxt->loc_obd->obd_name,
- logid->lgl_oid, logid->lgl_ogen, rc);
+ POSTID(&logid->lgl_oi), logid->lgl_ogen, rc);
RETURN(rc);
}
}
down_write(&cathandle->lgh_lock);
- cfs_list_add(&loghandle->u.phd.phd_entry, &cathandle->u.chd.chd_head);
+ cfs_list_add_tail(&loghandle->u.phd.phd_entry, &cathandle->u.chd.chd_head);
up_write(&cathandle->lgh_lock);
loghandle->u.phd.phd_cat_handle = cathandle;
struct llog_handle *cathandle,
struct llog_rec_hdr *rec, struct thandle *th)
{
+ struct llog_thread_info *lgi = llog_info(env);
+ struct llog_logid_rec *lirec = &lgi->lgi_logid;
struct llog_handle *loghandle, *next;
int rc = 0;
if (rc)
GOTO(out, rc);
+ lirec->lid_hdr.lrh_len = sizeof(*lirec);
+
if (!llog_exist(cathandle->u.chd.chd_current_log)) {
rc = llog_declare_create(env, cathandle->u.chd.chd_current_log,
th);
if (rc)
GOTO(out, rc);
- llog_declare_write_rec(env, cathandle, NULL, -1, th);
+ llog_declare_write_rec(env, cathandle, &lirec->lid_hdr, -1, th);
}
/* declare records in the llogs */
rc = llog_declare_write_rec(env, cathandle->u.chd.chd_current_log,
if (next) {
if (!llog_exist(next)) {
rc = llog_declare_create(env, next, th);
- llog_declare_write_rec(env, cathandle, NULL, -1, th);
+ llog_declare_write_rec(env, cathandle, &lirec->lid_hdr,
+ -1, th);
}
- llog_declare_write_rec(env, next, rec, -1, th);
+ /* XXX: we hope for declarations made for existing llog
+ * this might be not correct with some backends
+ * where declarations are expected against specific
+ * object like ZFS with full debugging enabled */
+ /*llog_declare_write_rec(env, next, rec, -1, th);*/
}
out:
RETURN(rc);
LASSERT(ctxt);
LASSERT(ctxt->loc_exp);
- if (cathandle->lgh_obj != NULL) {
- dt = ctxt->loc_exp->exp_obd->obd_lvfs_ctxt.dt;
- LASSERT(dt);
+ LASSERT(cathandle->lgh_obj != NULL);
+ dt = lu2dt_dev(cathandle->lgh_obj->do_lu.lo_dev);
- th = dt_trans_create(env, dt);
- if (IS_ERR(th))
- RETURN(PTR_ERR(th));
+ th = dt_trans_create(env, dt);
+ if (IS_ERR(th))
+ RETURN(PTR_ERR(th));
- rc = llog_cat_declare_add_rec(env, cathandle, rec, th);
- if (rc)
- GOTO(out_trans, rc);
+ rc = llog_cat_declare_add_rec(env, cathandle, rec, th);
+ if (rc)
+ GOTO(out_trans, rc);
- rc = dt_trans_start_local(env, dt, th);
- if (rc)
- GOTO(out_trans, rc);
- rc = llog_cat_add_rec(env, cathandle, rec, reccookie, buf, th);
+ rc = dt_trans_start_local(env, dt, th);
+ if (rc)
+ GOTO(out_trans, rc);
+ rc = llog_cat_add_rec(env, cathandle, rec, reccookie, buf, th);
out_trans:
- dt_trans_stop(env, dt, th);
- } else { /* lvfs compat code */
- LASSERT(cathandle->lgh_file != NULL);
- rc = llog_cat_declare_add_rec(env, cathandle, rec, th);
- if (rc == 0)
- rc = llog_cat_add_rec(env, cathandle, rec, reccookie,
- buf, th);
- }
+ dt_trans_stop(env, dt, th);
RETURN(rc);
}
EXPORT_SYMBOL(llog_cat_add);
rc = llog_cat_id2handle(env, cathandle, &loghandle, lgl);
if (rc) {
- CERROR("%s: cannot find handle for llog "LPX64": %d\n",
+ CERROR("%s: cannot find handle for llog "DOSTID": %d\n",
cathandle->lgh_ctxt->loc_obd->obd_name,
- lgl->lgl_oid, rc);
+ POSTID(&lgl->lgl_oi), rc);
failed++;
continue;
}
lrc = llog_cancel_rec(env, loghandle, cookies->lgc_index);
- if (lrc == 1) { /* log has been destroyed */
+ if (lrc == LLOG_DEL_PLAIN) { /* log has been destroyed */
index = loghandle->u.phd.phd_cookie.lgc_index;
rc = llog_cat_cleanup(env, cathandle, loghandle,
index);
CERROR("invalid record in catalog\n");
RETURN(-EINVAL);
}
- CDEBUG(D_HA, "processing log "LPX64":%x at index %u of catalog "
- LPX64"\n", lir->lid_id.lgl_oid, lir->lid_id.lgl_ogen,
- rec->lrh_index, cat_llh->lgh_id.lgl_oid);
+ CDEBUG(D_HA, "processing log "DOSTID":%x at index %u of catalog "
+ DOSTID"\n", POSTID(&lir->lid_id.lgl_oi), lir->lid_id.lgl_ogen,
+ rec->lrh_index, POSTID(&cat_llh->lgh_id.lgl_oi));
rc = llog_cat_id2handle(env, cat_llh, &llh, &lir->lid_id);
if (rc) {
- CERROR("%s: cannot find handle for llog "LPX64": %d\n",
+ CERROR("%s: cannot find handle for llog "DOSTID": %d\n",
cat_llh->lgh_ctxt->loc_obd->obd_name,
- lir->lid_id.lgl_oid, rc);
+ POSTID(&lir->lid_id.lgl_oi), rc);
RETURN(rc);
}
- if (rec->lrh_index < d->lpd_startcat)
- /* Skip processing of the logs until startcat */
- RETURN(0);
-
- if (d->lpd_startidx > 0) {
+ if (rec->lrh_index < d->lpd_startcat) {
+ /* Skip processing of the logs until startcat */
+ rc = 0;
+ } else if (d->lpd_startidx > 0) {
struct llog_process_cat_data cd;
cd.lpcd_first_idx = d->lpd_startidx;
rc = llog_process_or_fork(env, llh, d->lpd_cb, d->lpd_data,
NULL, false);
}
+
+ /* The empty plain log was destroyed while processing */
+ if (rc == LLOG_DEL_PLAIN)
+ rc = llog_cat_cleanup(env, cat_llh, llh,
+ llh->u.phd.phd_cookie.lgc_index);
llog_handle_put(llh);
RETURN(rc);
if (llh->llh_cat_idx > cat_llh->lgh_last_idx) {
struct llog_process_cat_data cd;
- CWARN("catlog "LPX64" crosses index zero\n",
- cat_llh->lgh_id.lgl_oid);
+ CWARN("catlog "DOSTID" crosses index zero\n",
+ POSTID(&cat_llh->lgh_id.lgl_oi));
cd.lpcd_first_idx = llh->llh_cat_idx;
cd.lpcd_last_idx = 0;
rc = llog_process_or_fork(env, cat_llh, llog_cat_process_cb,
&d, &cd, fork);
- if (rc != 0)
- RETURN(rc);
+ if (rc != 0)
+ RETURN(rc);
- cd.lpcd_first_idx = 0;
- cd.lpcd_last_idx = cat_llh->lgh_last_idx;
+ cd.lpcd_first_idx = 0;
+ cd.lpcd_last_idx = cat_llh->lgh_last_idx;
rc = llog_process_or_fork(env, cat_llh, llog_cat_process_cb,
&d, &cd, fork);
} else {
}
EXPORT_SYMBOL(llog_cat_process);
-#ifdef __KERNEL__
-int llog_cat_process_thread(void *data)
-{
- struct llog_process_cat_args *args = data;
- struct llog_ctxt *ctxt = args->lpca_ctxt;
- struct llog_handle *llh = NULL;
- llog_cb_t cb = args->lpca_cb;
- struct llog_thread_info *lgi;
- struct lu_env env;
- int rc;
- ENTRY;
-
- cfs_daemonize_ctxt("ll_log_process");
-
- rc = lu_env_init(&env, LCT_LOCAL);
- if (rc)
- GOTO(out, rc);
- lgi = llog_info(&env);
- LASSERT(lgi);
-
- lgi->lgi_logid = *(struct llog_logid *)(args->lpca_arg);
- rc = llog_open(&env, ctxt, &llh, &lgi->lgi_logid, NULL,
- LLOG_OPEN_EXISTS);
- if (rc) {
- CERROR("%s: cannot open llog "LPX64":%x: rc = %d\n",
- ctxt->loc_obd->obd_name, lgi->lgi_logid.lgl_oid,
- lgi->lgi_logid.lgl_ogen, rc);
- GOTO(out_env, rc);
- }
- rc = llog_init_handle(&env, llh, LLOG_F_IS_CAT, NULL);
- if (rc) {
- CERROR("%s: llog_init_handle failed: rc = %d\n",
- llh->lgh_ctxt->loc_obd->obd_name, rc);
- GOTO(release_llh, rc);
- }
-
- if (cb) {
- rc = llog_cat_process(&env, llh, cb, NULL, 0, 0);
- if (rc != LLOG_PROC_BREAK && rc != 0)
- CERROR("%s: llog_cat_process() failed: rc = %d\n",
- llh->lgh_ctxt->loc_obd->obd_name, rc);
- cb(&env, llh, NULL, NULL);
- } else {
- CWARN("No callback function for recovery\n");
- }
-
- /*
- * Make sure that all cached data is sent.
- */
- llog_sync(ctxt, NULL, 0);
- GOTO(release_llh, rc);
-release_llh:
- rc = llog_cat_close(&env, llh);
- if (rc)
- CERROR("%s: llog_cat_close() failed: rc = %d\n",
- llh->lgh_ctxt->loc_obd->obd_name, rc);
-out_env:
- lu_env_fini(&env);
-out:
- llog_ctxt_put(ctxt);
- OBD_FREE_PTR(args);
- return rc;
-}
-EXPORT_SYMBOL(llog_cat_process_thread);
-#endif
-
static int llog_cat_reverse_process_cb(const struct lu_env *env,
struct llog_handle *cat_llh,
struct llog_rec_hdr *rec, void *data)
{
- struct llog_process_data *d = data;
- struct llog_logid_rec *lir = (struct llog_logid_rec *)rec;
- struct llog_handle *llh;
- int rc;
+ struct llog_process_data *d = data;
+ struct llog_logid_rec *lir = (struct llog_logid_rec *)rec;
+ struct llog_handle *llh;
+ int rc;
- if (le32_to_cpu(rec->lrh_type) != LLOG_LOGID_MAGIC) {
- CERROR("invalid record in catalog\n");
- RETURN(-EINVAL);
- }
- CDEBUG(D_HA, "processing log "LPX64":%x at index %u of catalog "
- LPX64"\n", lir->lid_id.lgl_oid, lir->lid_id.lgl_ogen,
- le32_to_cpu(rec->lrh_index), cat_llh->lgh_id.lgl_oid);
+ if (le32_to_cpu(rec->lrh_type) != LLOG_LOGID_MAGIC) {
+ CERROR("invalid record in catalog\n");
+ RETURN(-EINVAL);
+ }
+ CDEBUG(D_HA, "processing log "DOSTID":%x at index %u of catalog "
+ DOSTID"\n", POSTID(&lir->lid_id.lgl_oi), lir->lid_id.lgl_ogen,
+ le32_to_cpu(rec->lrh_index), POSTID(&cat_llh->lgh_id.lgl_oi));
rc = llog_cat_id2handle(env, cat_llh, &llh, &lir->lid_id);
if (rc) {
- CERROR("%s: cannot find handle for llog "LPX64": %d\n",
+ CERROR("%s: cannot find handle for llog "DOSTID": %d\n",
cat_llh->lgh_ctxt->loc_obd->obd_name,
- lir->lid_id.lgl_oid, rc);
+ POSTID(&lir->lid_id.lgl_oi), rc);
RETURN(rc);
}
rc = llog_reverse_process(env, llh, d->lpd_cb, d->lpd_data, NULL);
+
+ /* The empty plain was destroyed while processing */
+ if (rc == LLOG_DEL_PLAIN)
+ rc = llog_cat_cleanup(env, cat_llh, llh,
+ llh->u.phd.phd_cookie.lgc_index);
+
llog_handle_put(llh);
RETURN(rc);
}
d.lpd_data = data;
d.lpd_cb = cb;
- if (llh->llh_cat_idx > cat_llh->lgh_last_idx) {
- CWARN("catalog "LPX64" crosses index zero\n",
- cat_llh->lgh_id.lgl_oid);
+ if (llh->llh_cat_idx > cat_llh->lgh_last_idx) {
+ CWARN("catalog "DOSTID" crosses index zero\n",
+ POSTID(&cat_llh->lgh_id.lgl_oi));
cd.lpcd_first_idx = 0;
cd.lpcd_last_idx = cat_llh->lgh_last_idx;
rc = llog_reverse_process(env, cat_llh,
llog_cat_reverse_process_cb,
&d, &cd);
- if (rc != 0)
- RETURN(rc);
+ if (rc != 0)
+ RETURN(rc);
- cd.lpcd_first_idx = le32_to_cpu(llh->llh_cat_idx);
- cd.lpcd_last_idx = 0;
+ cd.lpcd_first_idx = le32_to_cpu(llh->llh_cat_idx);
+ cd.lpcd_last_idx = 0;
rc = llog_reverse_process(env, cat_llh,
llog_cat_reverse_process_cb,
&d, &cd);
}
}
out:
- CDEBUG(D_RPCTRACE, "set catlog "LPX64" first idx %u\n",
- cathandle->lgh_id.lgl_oid, llh->llh_cat_idx);
- }
+ CDEBUG(D_RPCTRACE, "set catlog "DOSTID" first idx %u\n",
+ POSTID(&cathandle->lgh_id.lgl_oi), llh->llh_cat_idx);
+ }
- RETURN(0);
+ RETURN(0);
}
/* Cleanup deleted plain llog traces from catalog */
rc = llog_cancel_rec(env, cathandle, index);
if (rc == 0)
CDEBUG(D_HA, "cancel plain log at index"
- " %u of catalog "LPX64"\n",
- index, cathandle->lgh_id.lgl_oid);
+ " %u of catalog "DOSTID"\n",
+ index, POSTID(&cathandle->lgh_id.lgl_oi));
return rc;
}
CERROR("invalid record in catalog\n");
RETURN(-EINVAL);
}
- CDEBUG(D_HA, "processing log "LPX64":%x at index %u of catalog "
- LPX64"\n", lir->lid_id.lgl_oid, lir->lid_id.lgl_ogen,
- rec->lrh_index, cathandle->lgh_id.lgl_oid);
+
+ CDEBUG(D_HA, "processing log "DOSTID":%x at index %u of catalog "
+ DOSTID"\n", POSTID(&lir->lid_id.lgl_oi), lir->lid_id.lgl_ogen,
+ rec->lrh_index, POSTID(&cathandle->lgh_id.lgl_oi));
rc = llog_cat_id2handle(env, cathandle, &loghandle, &lir->lid_id);
if (rc) {
- CERROR("%s: cannot find handle for llog "LPX64": %d\n",
+ CERROR("%s: cannot find handle for llog "DOSTID": %d\n",
cathandle->lgh_ctxt->loc_obd->obd_name,
- lir->lid_id.lgl_oid, rc);
+ POSTID(&lir->lid_id.lgl_oi), rc);
if (rc == -ENOENT || rc == -ESTALE) {
/* remove index from catalog */
llog_cat_cleanup(env, cathandle, NULL, rec->lrh_index);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff