struct thandle *th)
{
struct llog_thread_info *lgi = llog_info(env);
- struct llog_logid_rec *rec = &lgi->lgi_logid;
- struct llog_log_hdr *llh;
- int rc, index, bitmap_size;
- ENTRY;
-
- llh = cathandle->lgh_hdr;
- bitmap_size = LLOG_BITMAP_SIZE(llh);
-
- index = (cathandle->lgh_last_idx + 1) % bitmap_size;
+ struct llog_logid_rec *rec = &lgi->lgi_logid;
+ int rc;
- /* maximum number of available slots in catlog is bitmap_size - 2 */
- if (llh->llh_cat_idx == index) {
- CERROR("no free catalog slots for log...\n");
- RETURN(-ENOSPC);
- }
+ ENTRY;
if (OBD_FAIL_CHECK(OBD_FAIL_MDS_LLOG_CREATE_FAILED))
RETURN(-ENOSPC);
}
rc = llog_init_handle(env, loghandle,
- LLOG_F_IS_PLAIN | LLOG_F_ZAP_WHEN_EMPTY,
- &cathandle->lgh_hdr->llh_tgtuuid);
- if (rc)
- GOTO(out_destroy, rc);
-
- if (index == 0)
- index = 1;
-
- spin_lock(&loghandle->lgh_hdr_lock);
- llh->llh_count++;
- if (ext2_set_bit(index, llh->llh_bitmap)) {
- CERROR("argh, index %u already set in log bitmap?\n",
- index);
- spin_unlock(&loghandle->lgh_hdr_lock);
- LBUG(); /* should never happen */
- }
- spin_unlock(&loghandle->lgh_hdr_lock);
-
- cathandle->lgh_last_idx = index;
- llh->llh_tail.lrt_index = index;
+ LLOG_F_IS_PLAIN | LLOG_F_ZAP_WHEN_EMPTY,
+ &cathandle->lgh_hdr->llh_tgtuuid);
+ if (rc)
+ GOTO(out_destroy, rc);
- 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 */
+ /* append the new record into catalog. The new index will be
+ * assigned to the record and updated in rec header */
rc = llog_write_rec(env, cathandle, &rec->lid_hdr,
- &loghandle->u.phd.phd_cookie, 1, NULL, index, th);
+ &loghandle->u.phd.phd_cookie, LLOG_NEXT_IDX, th);
if (rc < 0)
GOTO(out_destroy, rc);
- loghandle->lgh_hdr->llh_cat_idx = index;
+ CDEBUG(D_OTHER, "new recovery 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));
+
+ loghandle->lgh_hdr->llh_cat_idx = rec->lid_hdr.lrh_index;
RETURN(0);
out_destroy:
llog_destroy(env, loghandle);
*/
int llog_cat_add_rec(const struct lu_env *env, struct llog_handle *cathandle,
struct llog_rec_hdr *rec, struct llog_cookie *reccookie,
- void *buf, struct thandle *th)
+ struct thandle *th)
{
struct llog_handle *loghandle;
int rc;
}
}
/* now let's try to add the record */
- rc = llog_write_rec(env, loghandle, rec, reccookie, 1, buf, -1, th);
+ rc = llog_write_rec(env, loghandle, rec, reccookie, LLOG_NEXT_IDX, th);
if (rc < 0)
CDEBUG_LIMIT(rc == -ENOSPC ? D_HA : D_ERROR,
"llog_write_rec %d: lh=%p\n", rc, loghandle);
}
}
/* now let's try to add the record */
- rc = llog_write_rec(env, loghandle, rec, reccookie, 1, buf,
- -1, th);
+ rc = llog_write_rec(env, loghandle, rec, reccookie,
+ LLOG_NEXT_IDX, th);
if (rc < 0)
CERROR("llog_write_rec %d: lh=%p\n", rc, loghandle);
up_write(&loghandle->lgh_lock);
EXPORT_SYMBOL(llog_cat_declare_add_rec);
int llog_cat_add(const struct lu_env *env, struct llog_handle *cathandle,
- struct llog_rec_hdr *rec, struct llog_cookie *reccookie,
- void *buf)
+ struct llog_rec_hdr *rec, struct llog_cookie *reccookie)
{
struct llog_ctxt *ctxt;
struct dt_device *dt;
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 = llog_cat_add_rec(env, cathandle, rec, reccookie, th);
out_trans:
dt_trans_stop(env, dt, th);
RETURN(rc);
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;
ENTRY;
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);
+ }
+
if (rec->lrh_index < d->lpd_startcat) {
/* Skip processing of the logs until startcat */
rc = 0;
NULL, false);
}
+out:
/* The empty plain log was destroyed while processing */
if (rc == LLOG_DEL_PLAIN)
rc = llog_cat_cleanup(env, cat_llh, llh,
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) {
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 (rc)
RETURN(rc);
- rc = llog_process_or_fork(env, llh, cat_cancel_cb, NULL, NULL, false);
- if (rc)
- CERROR("%s: llog_process() with cat_cancel_cb failed: rc = "
- "%d\n", llh->lgh_ctxt->loc_obd->obd_name, rc);
RETURN(0);
}
EXPORT_SYMBOL(llog_cat_init_and_process);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff