* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 2015, Intel Corporation.
+ * Copyright (c) 2012, 2016, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
if (rc < 0)
GOTO(out_destroy, rc);
- CDEBUG(D_OTHER, "new plain log "DOSTID":%x for index %u of catalog"
- DOSTID"\n", POSTID(&loghandle->lgh_id.lgl_oi),
- loghandle->lgh_id.lgl_ogen, rec->lid_hdr.lrh_index,
- POSTID(&cathandle->lgh_id.lgl_oi));
+ CDEBUG(D_OTHER, "new plain log "DFID".%u of catalog "DFID"\n",
+ PFID(&loghandle->lgh_id.lgl_oi.oi_fid), rec->lid_hdr.lrh_index,
+ PFID(&cathandle->lgh_id.lgl_oi.oi_fid));
loghandle->lgh_hdr->llh_cat_idx = rec->lid_hdr.lrh_index;
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 "DOSTID" generation %x != %x\n",
- loghandle->lgh_ctxt->loc_obd->obd_name,
- POSTID(&logid->lgl_oi), cgl->lgl_ogen,
- logid->lgl_ogen);
+ CWARN("%s: log "DFID" generation %x != %x\n",
+ loghandle->lgh_ctxt->loc_obd->obd_name,
+ PFID(&logid->lgl_oi.oi_fid),
+ cgl->lgl_ogen, logid->lgl_ogen);
continue;
}
loghandle->u.phd.phd_cat_handle = cathandle;
rc = llog_open(env, cathandle->lgh_ctxt, &loghandle, logid, NULL,
LLOG_OPEN_EXISTS);
if (rc < 0) {
- CERROR("%s: error opening log id "DOSTID":%x: rc = %d\n",
+ CERROR("%s: error opening log id "DFID":%x: rc = %d\n",
cathandle->lgh_ctxt->loc_obd->obd_name,
- POSTID(&logid->lgl_oi), logid->lgl_ogen, rc);
+ PFID(&logid->lgl_oi.oi_fid), logid->lgl_ogen, rc);
RETURN(rc);
}
ENTRY;
for (i = 0; i < count; i++, cookies++) {
- struct llog_handle *loghandle;
- struct llog_logid *lgl = &cookies->lgc_lgl;
- int lrc;
+ struct llog_handle *loghandle;
+ struct llog_logid *lgl = &cookies->lgc_lgl;
+ int lrc;
rc = llog_cat_id2handle(env, cathandle, &loghandle, lgl);
if (rc) {
- CERROR("%s: cannot find handle for llog "DOSTID": %d\n",
+ CDEBUG(D_HA, "%s: cannot find llog for handle "DFID":%x"
+ ": rc = %d\n",
cathandle->lgh_ctxt->loc_obd->obd_name,
- POSTID(&lgl->lgl_oi), rc);
+ PFID(&lgl->lgl_oi.oi_fid), lgl->lgl_ogen, rc);
failed++;
continue;
}
lrc = llog_cancel_rec(env, loghandle, cookies->lgc_index);
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);
+ rc = llog_cat_cleanup(env, cathandle, loghandle, index);
} else if (lrc == -ENOENT) {
if (rc == 0) /* ENOENT shouldn't rewrite any error */
rc = lrc;
}
EXPORT_SYMBOL(llog_cat_cancel_records);
-static int llog_cat_process_cb(const struct lu_env *env,
- struct llog_handle *cat_llh,
- struct llog_rec_hdr *rec, void *data)
+static int llog_cat_process_common(const struct lu_env *env,
+ struct llog_handle *cat_llh,
+ struct llog_rec_hdr *rec,
+ struct llog_handle **llhp)
{
- struct llog_process_data *d = data;
- struct llog_logid_rec *lir = (struct llog_logid_rec *)rec;
- struct llog_handle *llh;
+ struct llog_logid_rec *lir = container_of(rec, typeof(*lir), lid_hdr);
struct llog_log_hdr *hdr;
- int rc;
+ int rc;
- ENTRY;
- if (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,
- rec->lrh_index, POSTID(&cat_llh->lgh_id.lgl_oi));
+ ENTRY;
+ if (rec->lrh_type != le32_to_cpu(LLOG_LOGID_MAGIC)) {
+ rc = -EINVAL;
+ CWARN("%s: invalid record in catalog "DFID":%x: rc = %d\n",
+ cat_llh->lgh_ctxt->loc_obd->obd_name,
+ PFID(&cat_llh->lgh_id.lgl_oi.oi_fid),
+ cat_llh->lgh_id.lgl_ogen, rc);
+ RETURN(rc);
+ }
+ CDEBUG(D_HA, "processing log "DFID":%x at index %u of catalog "DFID"\n",
+ PFID(&lir->lid_id.lgl_oi.oi_fid), lir->lid_id.lgl_ogen,
+ le32_to_cpu(rec->lrh_index),
+ PFID(&cat_llh->lgh_id.lgl_oi.oi_fid));
- rc = llog_cat_id2handle(env, cat_llh, &llh, &lir->lid_id);
+ rc = llog_cat_id2handle(env, cat_llh, llhp, &lir->lid_id);
if (rc) {
- CERROR("%s: cannot find handle for llog "DOSTID": %d\n",
- cat_llh->lgh_ctxt->loc_obd->obd_name,
- POSTID(&lir->lid_id.lgl_oi), rc);
- if (rc == -ENOENT || rc == -ESTALE) {
- /* After a server crash, a stub of index
- * record in catlog could be kept, because
- * plain log destroy + catlog index record
- * deletion are not atomic. So we end up with
- * an index but no actual record. Destroy the
- * index and move on. */
+ /* After a server crash, a stub of index record in catlog could
+ * be kept, because plain log destroy + catlog index record
+ * deletion are not atomic. So we end up with an index but no
+ * actual record. Destroy the index and move on. */
+ if (rc == -ENOENT || rc == -ESTALE)
rc = llog_cat_cleanup(env, cat_llh, NULL,
rec->lrh_index);
- }
+ if (rc)
+ CWARN("%s: can't find llog handle "DFID":%x: rc = %d\n",
+ cat_llh->lgh_ctxt->loc_obd->obd_name,
+ PFID(&lir->lid_id.lgl_oi.oi_fid),
+ lir->lid_id.lgl_ogen, rc);
RETURN(rc);
}
/* clean old empty llogs, do not consider current llog in use */
- /* ignore remote (lgh_obj=NULL) llogs */
- hdr = llh->lgh_hdr;
+ /* ignore remote (lgh_obj == NULL) llogs */
+ hdr = (*llhp)->lgh_hdr;
if ((hdr->llh_flags & LLOG_F_ZAP_WHEN_EMPTY) &&
hdr->llh_count == 1 && cat_llh->lgh_obj != NULL &&
- llh != cat_llh->u.chd.chd_current_log) {
- rc = llog_destroy(env, llh);
+ *llhp != cat_llh->u.chd.chd_current_log) {
+ rc = llog_destroy(env, *llhp);
if (rc)
- CERROR("%s: fail to destroy empty log: rc = %d\n",
- llh->lgh_ctxt->loc_obd->obd_name, rc);
- GOTO(out, rc = LLOG_DEL_PLAIN);
+ CWARN("%s: can't destroy empty log "DFID": rc = %d\n",
+ (*llhp)->lgh_ctxt->loc_obd->obd_name,
+ PFID(&lir->lid_id.lgl_oi.oi_fid), rc);
+ rc = LLOG_DEL_PLAIN;
}
+ RETURN(rc);
+}
+
+static int llog_cat_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_handle *llh = NULL;
+ int rc;
+
+ ENTRY;
+ rc = llog_cat_process_common(env, cat_llh, rec, &llh);
+ if (rc)
+ GOTO(out, rc);
+
if (rec->lrh_index < d->lpd_startcat) {
/* Skip processing of the logs until startcat */
rc = 0;
if (rc == LLOG_DEL_PLAIN)
rc = llog_cat_cleanup(env, cat_llh, llh,
llh->u.phd.phd_cookie.lgc_index);
- llog_handle_put(llh);
+ if (llh)
+ llog_handle_put(llh);
RETURN(rc);
}
if (llh->llh_cat_idx >= cat_llh->lgh_last_idx &&
llh->llh_count > 1) {
- struct llog_process_cat_data cd;
+ struct llog_process_cat_data cd;
- CWARN("catlog "DOSTID" crosses index zero\n",
- POSTID(&cat_llh->lgh_id.lgl_oi));
+ CWARN("%s: catlog "DFID" crosses index zero\n",
+ cat_llh->lgh_ctxt->loc_obd->obd_name,
+ PFID(&cat_llh->lgh_id.lgl_oi.oi_fid));
- cd.lpcd_first_idx = llh->llh_cat_idx;
- cd.lpcd_last_idx = 0;
+ cd.lpcd_first_idx = llh->llh_cat_idx;
+ cd.lpcd_last_idx = 0;
rc = llog_process_or_fork(env, cat_llh, cat_cb,
&d, &cd, fork);
if (rc != 0)
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_handle *llh = NULL;
__u64 *cum_size = d->lpd_data;
__u64 size;
+ int rc;
ENTRY;
- if (rec->lrh_type != LLOG_LOGID_MAGIC) {
- CERROR("%s: invalid record in catalog, rc = %d\n",
- cat_llh->lgh_ctxt->loc_obd->obd_name, -EINVAL);
- 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,
- rec->lrh_index, POSTID(&cat_llh->lgh_id.lgl_oi));
-
- rc = llog_cat_id2handle(env, cat_llh, &llh, &lir->lid_id);
- if (rc) {
- CWARN("%s: cannot find handle for llog "DOSTID": rc = %d\n",
- cat_llh->lgh_ctxt->loc_obd->obd_name,
- POSTID(&lir->lid_id.lgl_oi), rc);
+ rc = llog_cat_process_common(env, cat_llh, rec, &llh);
+ if (llh == NULL)
RETURN(0);
- }
- size = llog_size(env, llh);
- *cum_size += size;
- CDEBUG(D_INFO, "Add llog entry "DOSTID" size %llu\n",
- POSTID(&llh->lgh_id.lgl_oi), size);
+ if (rc == LLOG_DEL_PLAIN) {
+ /* empty log was deleted, don't count it */
+ rc = llog_cat_cleanup(env, cat_llh, llh,
+ llh->u.phd.phd_cookie.lgc_index);
+ } else {
+ size = llog_size(env, llh);
+ *cum_size += size;
+
+ CDEBUG(D_INFO, "Add llog entry "DFID" size=%llu, tot=%llu\n",
+ PFID(&llh->lgh_id.lgl_oi.oi_fid), size, *cum_size);
+ }
llog_handle_put(llh);
RETURN(0);
-
}
__u64 llog_cat_size(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;
- struct llog_log_hdr *hdr;
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 "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 "DOSTID": %d\n",
- cat_llh->lgh_ctxt->loc_obd->obd_name,
- POSTID(&lir->lid_id.lgl_oi), rc);
- if (rc == -ENOENT || rc == -ESTALE) {
- /* After a server crash, a stub of index
- * record in catlog could be kept, because
- * plain log destroy + catlog index record
- * deletion are not atomic. So we end up with
- * an index but no actual record. Destroy the
- * index and move on. */
- rc = llog_cat_cleanup(env, cat_llh, NULL,
- rec->lrh_index);
- }
-
+ ENTRY;
+ rc = llog_cat_process_common(env, cat_llh, rec, &llh);
+ if (rc)
RETURN(rc);
- }
-
- /* clean old empty llogs, do not consider current llog in use */
- hdr = llh->lgh_hdr;
- if ((hdr->llh_flags & LLOG_F_ZAP_WHEN_EMPTY) &&
- hdr->llh_count == 1 &&
- llh != cat_llh->u.chd.chd_current_log) {
- rc = llog_destroy(env, llh);
- if (rc)
- CERROR("%s: fail to destroy empty log: rc = %d\n",
- llh->lgh_ctxt->loc_obd->obd_name, rc);
- GOTO(out, rc = LLOG_DEL_PLAIN);
- }
rc = llog_reverse_process(env, llh, d->lpd_cb, d->lpd_data, NULL);
-out:
/* The empty plain was destroyed while processing */
if (rc == LLOG_DEL_PLAIN)
rc = llog_cat_cleanup(env, cat_llh, llh,
if (llh->llh_cat_idx >= cat_llh->lgh_last_idx &&
llh->llh_count > 1) {
- CWARN("catalog "DOSTID" crosses index zero\n",
- POSTID(&cat_llh->lgh_id.lgl_oi));
+ CWARN("%s: catalog "DFID" crosses index zero\n",
+ cat_llh->lgh_ctxt->loc_obd->obd_name,
+ PFID(&cat_llh->lgh_id.lgl_oi.oi_fid));
- 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_reverse_process(env, cat_llh,
llog_cat_reverse_process_cb,
&d, &cd);
}
}
- CDEBUG(D_RPCTRACE, "Set catlog "DOSTID" first idx %u,"
- " (last_idx %u)\n", POSTID(&cathandle->lgh_id.lgl_oi),
+ CDEBUG(D_RPCTRACE, "catlog "DFID" first idx %u, last_idx %u\n",
+ PFID(&cathandle->lgh_id.lgl_oi.oi_fid),
llh->llh_cat_idx, cathandle->lgh_last_idx);
}
llog_cat_set_first_idx(cathandle, index);
rc = llog_cancel_rec(env, cathandle, index);
if (rc == 0)
- CDEBUG(D_HA, "cancel plain log at index"
- " %u of catalog "DOSTID"\n",
- index, POSTID(&cathandle->lgh_id.lgl_oi));
+ CDEBUG(D_HA, "cancel plain log at index %u of catalog "DFID"\n",
+ index, PFID(&cathandle->lgh_id.lgl_oi.oi_fid));
return rc;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff