-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
#define DEBUG_SUBSYSTEM S_LOG
-#ifndef EXPORT_SYMTAB
-#define EXPORT_SYMTAB
-#endif
-
#ifndef __KERNEL__
#include <liblustre.h>
#endif
#include <obd_class.h>
-#include <lustre_log.h>
-#include <libcfs/list.h>
+
+#include "llog_internal.h"
/* Create a new log handle and add it to the open list.
* This log handle will be closed when all of the records in it are removed.
*
* Assumes caller has already pushed us into the kernel context and is locking.
*/
-static struct llog_handle *llog_cat_new_log(struct llog_handle *cathandle)
+static struct llog_handle *llog_cat_new_log(const struct lu_env *env,
+ struct llog_handle *cathandle)
{
struct llog_handle *loghandle;
struct llog_log_hdr *llh;
if (OBD_FAIL_CHECK(OBD_FAIL_MDS_LLOG_CREATE_FAILED))
RETURN(ERR_PTR(-ENOSPC));
- rc = llog_create(cathandle->lgh_ctxt, &loghandle, NULL, NULL);
- if (rc)
- RETURN(ERR_PTR(rc));
+ rc = llog_open_create(env, cathandle->lgh_ctxt, &loghandle, NULL,
+ NULL);
+ if (rc)
+ RETURN(ERR_PTR(rc));
- rc = llog_init_handle(loghandle,
+ rc = llog_init_handle(env, loghandle,
LLOG_F_IS_PLAIN | LLOG_F_ZAP_WHEN_EMPTY,
&cathandle->lgh_hdr->llh_tgtuuid);
if (rc)
if (index == 0)
index = 1;
+
+ cfs_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);
+ cfs_spin_unlock(&loghandle->lgh_hdr_lock);
LBUG(); /* should never happen */
}
+ cfs_spin_unlock(&loghandle->lgh_hdr_lock);
+
cathandle->lgh_last_idx = index;
- llh->llh_count++;
llh->llh_tail.lrt_index = index;
CDEBUG(D_RPCTRACE,"new recovery log "LPX64":%x for index %u of catalog "
rec.lid_tail.lrt_index = index;
/* update the catalog: header and record */
- rc = llog_write_rec(cathandle, &rec.lid_hdr,
+ rc = llog_write_rec(env, cathandle, &rec.lid_hdr,
&loghandle->u.phd.phd_cookie, 1, NULL, index);
if (rc < 0) {
GOTO(out_destroy, rc);
loghandle->lgh_hdr->llh_cat_idx = index;
cathandle->u.chd.chd_current_log = loghandle;
- LASSERT(list_empty(&loghandle->u.phd.phd_entry));
- list_add_tail(&loghandle->u.phd.phd_entry, &cathandle->u.chd.chd_head);
+ LASSERT(cfs_list_empty(&loghandle->u.phd.phd_entry));
+ cfs_list_add_tail(&loghandle->u.phd.phd_entry,
+ &cathandle->u.chd.chd_head);
out_destroy:
- if (rc < 0)
- llog_destroy(loghandle);
+ if (rc < 0)
+ llog_destroy(env, loghandle);
- RETURN(loghandle);
+ RETURN(loghandle);
}
/* Open an existent log handle and add it to the open list.
* Assumes caller has already pushed us into the kernel context and is locking.
* We return a lock on the handle to ensure nobody yanks it from us.
*/
-int llog_cat_id2handle(struct llog_handle *cathandle, struct llog_handle **res,
- struct llog_logid *logid)
+int llog_cat_id2handle(const struct lu_env *env, struct llog_handle *cathandle,
+ struct llog_handle **res, struct llog_logid *logid)
{
- struct llog_handle *loghandle;
- int rc = 0;
- ENTRY;
-
- if (cathandle == NULL)
- RETURN(-EBADF);
-
- list_for_each_entry(loghandle, &cathandle->u.chd.chd_head,
- u.phd.phd_entry) {
- struct llog_logid *cgl = &loghandle->lgh_id;
- if (cgl->lgl_oid == logid->lgl_oid) {
- if (cgl->lgl_ogen != logid->lgl_ogen) {
- CERROR("log "LPX64" generation %x != %x\n",
- logid->lgl_oid, cgl->lgl_ogen,
- logid->lgl_ogen);
- continue;
- }
- loghandle->u.phd.phd_cat_handle = cathandle;
- GOTO(out, rc = 0);
- }
- }
-
- rc = llog_create(cathandle->lgh_ctxt, &loghandle, logid, NULL);
- if (rc) {
- CERROR("error opening log id "LPX64":%x: rc %d\n",
- logid->lgl_oid, logid->lgl_ogen, rc);
- } else {
- rc = llog_init_handle(loghandle, LLOG_F_IS_PLAIN, NULL);
- if (!rc) {
- list_add(&loghandle->u.phd.phd_entry,
- &cathandle->u.chd.chd_head);
- }
- }
- if (!rc) {
- loghandle->u.phd.phd_cat_handle = cathandle;
- loghandle->u.phd.phd_cookie.lgc_lgl = cathandle->lgh_id;
- loghandle->u.phd.phd_cookie.lgc_index =
- loghandle->lgh_hdr->llh_cat_idx;
- }
-
+ struct llog_handle *loghandle;
+ int rc = 0;
+
+ ENTRY;
+
+ if (cathandle == NULL)
+ RETURN(-EBADF);
+
+ cfs_list_for_each_entry(loghandle, &cathandle->u.chd.chd_head,
+ u.phd.phd_entry) {
+ struct llog_logid *cgl = &loghandle->lgh_id;
+
+ if (cgl->lgl_oid == logid->lgl_oid) {
+ if (cgl->lgl_ogen != logid->lgl_ogen) {
+ CERROR("%s: log "LPX64" generation %x != %x\n",
+ loghandle->lgh_ctxt->loc_obd->obd_name,
+ logid->lgl_oid, cgl->lgl_ogen,
+ logid->lgl_ogen);
+ continue;
+ }
+ loghandle->u.phd.phd_cat_handle = cathandle;
+ GOTO(out, rc = 0);
+ }
+ }
+
+ 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",
+ cathandle->lgh_ctxt->loc_obd->obd_name,
+ logid->lgl_oid, logid->lgl_ogen, rc);
+ GOTO(out, rc);
+ }
+
+ rc = llog_init_handle(env, loghandle, LLOG_F_IS_PLAIN, NULL);
+ if (rc < 0) {
+ llog_close(env, loghandle);
+ GOTO(out, rc);
+ }
+
+ cfs_list_add(&loghandle->u.phd.phd_entry, &cathandle->u.chd.chd_head);
+
+ loghandle->u.phd.phd_cat_handle = cathandle;
+ loghandle->u.phd.phd_cookie.lgc_lgl = cathandle->lgh_id;
+ loghandle->u.phd.phd_cookie.lgc_index = loghandle->lgh_hdr->llh_cat_idx;
+ EXIT;
out:
- *res = loghandle;
- RETURN(rc);
+ *res = loghandle;
+ return rc;
}
-int llog_cat_put(struct llog_handle *cathandle)
+int llog_cat_close(const struct lu_env *env, struct llog_handle *cathandle)
{
- struct llog_handle *loghandle, *n;
- int rc;
- ENTRY;
-
- list_for_each_entry_safe(loghandle, n, &cathandle->u.chd.chd_head,
- u.phd.phd_entry) {
- int err = llog_close(loghandle);
- if (err)
- CERROR("error closing loghandle\n");
- }
- rc = llog_close(cathandle);
- RETURN(rc);
+ struct llog_handle *loghandle, *n;
+ int rc;
+
+ ENTRY;
+
+ cfs_list_for_each_entry_safe(loghandle, n, &cathandle->u.chd.chd_head,
+ u.phd.phd_entry) {
+ struct llog_log_hdr *llh = loghandle->lgh_hdr;
+ int index;
+
+ /* unlink open-not-created llogs */
+ cfs_list_del_init(&loghandle->u.phd.phd_entry);
+ llh = loghandle->lgh_hdr;
+ if (loghandle->lgh_obj != NULL && llh != NULL &&
+ (llh->llh_flags & LLOG_F_ZAP_WHEN_EMPTY) &&
+ (llh->llh_count == 1)) {
+ rc = llog_destroy(env, loghandle);
+ if (rc)
+ CERROR("%s: failure destroying log during "
+ "cleanup: rc = %d\n",
+ loghandle->lgh_ctxt->loc_obd->obd_name,
+ rc);
+
+ index = loghandle->u.phd.phd_cookie.lgc_index;
+
+ LASSERT(index);
+ llog_cat_set_first_idx(cathandle, index);
+ rc = llog_cancel_rec(env, cathandle, index);
+ if (rc == 0)
+ CDEBUG(D_RPCTRACE,
+ "cancel plain log at index %u of "
+ "catalog "LPX64"\n",
+ index, cathandle->lgh_id.lgl_oid);
+ }
+ llog_close(env, loghandle);
+ }
+ /* if handle was stored in ctxt, remove it too */
+ if (cathandle->lgh_ctxt->loc_handle == cathandle)
+ cathandle->lgh_ctxt->loc_handle = NULL;
+ rc = llog_close(env, cathandle);
+ RETURN(rc);
}
-EXPORT_SYMBOL(llog_cat_put);
+EXPORT_SYMBOL(llog_cat_close);
/**
* lockdep markers for nested struct llog_handle::lgh_lock locking.
*
* NOTE: loghandle is write-locked upon successful return
*/
-static struct llog_handle *llog_cat_current_log(struct llog_handle *cathandle,
- int create)
+static struct llog_handle *llog_cat_current_log(const struct lu_env *env,
+ struct llog_handle *cathandle,
+ int create)
{
struct llog_handle *loghandle = NULL;
ENTRY;
- down_read_nested(&cathandle->lgh_lock, LLOGH_CAT);
+ cfs_down_read_nested(&cathandle->lgh_lock, LLOGH_CAT);
loghandle = cathandle->u.chd.chd_current_log;
if (loghandle) {
struct llog_log_hdr *llh = loghandle->lgh_hdr;
- down_write_nested(&loghandle->lgh_lock, LLOGH_LOG);
+
+ cfs_down_write_nested(&loghandle->lgh_lock, LLOGH_LOG);
if (loghandle->lgh_last_idx < LLOG_BITMAP_SIZE(llh) - 1) {
- up_read(&cathandle->lgh_lock);
+ cfs_up_read(&cathandle->lgh_lock);
RETURN(loghandle);
} else {
- up_write(&loghandle->lgh_lock);
+ cfs_up_write(&loghandle->lgh_lock);
}
}
if (!create) {
if (loghandle)
- down_write(&loghandle->lgh_lock);
- up_read(&cathandle->lgh_lock);
+ cfs_down_write(&loghandle->lgh_lock);
+ cfs_up_read(&cathandle->lgh_lock);
RETURN(loghandle);
}
- up_read(&cathandle->lgh_lock);
+ cfs_up_read(&cathandle->lgh_lock);
/* time to create new log */
/* first, we have to make sure the state hasn't changed */
- down_write_nested(&cathandle->lgh_lock, LLOGH_CAT);
+ cfs_down_write_nested(&cathandle->lgh_lock, LLOGH_CAT);
loghandle = cathandle->u.chd.chd_current_log;
if (loghandle) {
struct llog_log_hdr *llh = loghandle->lgh_hdr;
- down_write_nested(&loghandle->lgh_lock, LLOGH_LOG);
+
+ cfs_down_write_nested(&loghandle->lgh_lock, LLOGH_LOG);
if (loghandle->lgh_last_idx < LLOG_BITMAP_SIZE(llh) - 1) {
- up_write(&cathandle->lgh_lock);
+ cfs_up_write(&cathandle->lgh_lock);
RETURN(loghandle);
} else {
- up_write(&loghandle->lgh_lock);
+ cfs_up_write(&loghandle->lgh_lock);
}
}
CDEBUG(D_INODE, "creating new log\n");
- loghandle = llog_cat_new_log(cathandle);
+ loghandle = llog_cat_new_log(env, cathandle);
if (!IS_ERR(loghandle))
- down_write_nested(&loghandle->lgh_lock, LLOGH_LOG);
- up_write(&cathandle->lgh_lock);
+ cfs_down_write_nested(&loghandle->lgh_lock, LLOGH_LOG);
+ cfs_up_write(&cathandle->lgh_lock);
RETURN(loghandle);
}
*
* Assumes caller has already pushed us into the kernel context.
*/
-int llog_cat_add_rec(struct llog_handle *cathandle, struct llog_rec_hdr *rec,
- struct llog_cookie *reccookie, void *buf)
+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 llog_handle *loghandle;
int rc;
ENTRY;
LASSERT(rec->lrh_len <= LLOG_CHUNK_SIZE);
- loghandle = llog_cat_current_log(cathandle, 1);
- if (IS_ERR(loghandle))
- RETURN(PTR_ERR(loghandle));
- /* loghandle is already locked by llog_cat_current_log() for us */
- rc = llog_write_rec(loghandle, rec, reccookie, 1, buf, -1);
- up_write(&loghandle->lgh_lock);
+ loghandle = llog_cat_current_log(env, cathandle, 1);
+ if (IS_ERR(loghandle))
+ RETURN(PTR_ERR(loghandle));
+ /* loghandle is already locked by llog_cat_current_log() for us */
+ rc = llog_write_rec(env, loghandle, rec, reccookie, 1, buf, -1);
+ if (rc < 0)
+ CERROR("llog_write_rec %d: lh=%p\n", rc, loghandle);
+ cfs_up_write(&loghandle->lgh_lock);
if (rc == -ENOSPC) {
/* to create a new plain log */
- loghandle = llog_cat_current_log(cathandle, 1);
- if (IS_ERR(loghandle))
- RETURN(PTR_ERR(loghandle));
- rc = llog_write_rec(loghandle, rec, reccookie, 1, buf, -1);
- up_write(&loghandle->lgh_lock);
+ loghandle = llog_cat_current_log(env, cathandle, 1);
+ if (IS_ERR(loghandle))
+ RETURN(PTR_ERR(loghandle));
+ rc = llog_write_rec(env, loghandle, rec, reccookie, 1, buf,
+ -1);
+ cfs_up_write(&loghandle->lgh_lock);
}
RETURN(rc);
*
* Assumes caller has already pushed us into the kernel context.
*/
-int llog_cat_cancel_records(struct llog_handle *cathandle, int count,
- struct llog_cookie *cookies)
+int llog_cat_cancel_records(const struct lu_env *env,
+ struct llog_handle *cathandle, int count,
+ struct llog_cookie *cookies)
{
- int i, index, rc = 0;
- ENTRY;
-
- down_write_nested(&cathandle->lgh_lock, LLOGH_CAT);
- for (i = 0; i < count; i++, cookies++) {
- struct llog_handle *loghandle;
- struct llog_logid *lgl = &cookies->lgc_lgl;
-
- rc = llog_cat_id2handle(cathandle, &loghandle, lgl);
- if (rc) {
- CERROR("Cannot find log "LPX64"\n", lgl->lgl_oid);
- break;
- }
-
- down_write_nested(&loghandle->lgh_lock, LLOGH_LOG);
- rc = llog_cancel_rec(loghandle, cookies->lgc_index);
- up_write(&loghandle->lgh_lock);
-
- if (rc == 1) { /* log has been destroyed */
- index = loghandle->u.phd.phd_cookie.lgc_index;
- if (cathandle->u.chd.chd_current_log == loghandle)
- cathandle->u.chd.chd_current_log = NULL;
- llog_free_handle(loghandle);
-
- LASSERT(index);
- llog_cat_set_first_idx(cathandle, index);
- rc = llog_cancel_rec(cathandle, index);
+ int i, index, rc = 0;
+
+ ENTRY;
+
+ cfs_down_write_nested(&cathandle->lgh_lock, LLOGH_CAT);
+ for (i = 0; i < count; i++, cookies++) {
+ struct llog_handle *loghandle;
+ struct llog_logid *lgl = &cookies->lgc_lgl;
+
+ rc = llog_cat_id2handle(env, cathandle, &loghandle, lgl);
+ if (rc) {
+ CERROR("Cannot find log "LPX64"\n", lgl->lgl_oid);
+ break;
+ }
+
+ cfs_down_write_nested(&loghandle->lgh_lock, LLOGH_LOG);
+ rc = llog_cancel_rec(env, loghandle, cookies->lgc_index);
+ cfs_up_write(&loghandle->lgh_lock);
+
+ if (rc == 1) { /* log has been destroyed */
+ index = loghandle->u.phd.phd_cookie.lgc_index;
+ if (cathandle->u.chd.chd_current_log == loghandle)
+ cathandle->u.chd.chd_current_log = NULL;
+ llog_close(env, loghandle);
+
+ LASSERT(index);
+ llog_cat_set_first_idx(cathandle, index);
+ rc = llog_cancel_rec(env, cathandle, index);
if (rc == 0)
CDEBUG(D_RPCTRACE,"cancel plain log at index %u"
" of catalog "LPX64"\n",
index, cathandle->lgh_id.lgl_oid);
}
}
- up_write(&cathandle->lgh_lock);
+ cfs_up_write(&cathandle->lgh_lock);
RETURN(rc);
}
EXPORT_SYMBOL(llog_cat_cancel_records);
-int llog_cat_process_cb(struct llog_handle *cat_llh, struct llog_rec_hdr *rec,
- void *data)
+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_logid_rec *lir = (struct llog_logid_rec *)rec;
LPX64"\n", lir->lid_id.lgl_oid, lir->lid_id.lgl_ogen,
rec->lrh_index, cat_llh->lgh_id.lgl_oid);
- rc = llog_cat_id2handle(cat_llh, &llh, &lir->lid_id);
+ rc = llog_cat_id2handle(env, cat_llh, &llh, &lir->lid_id);
if (rc) {
CERROR("Cannot find handle for log "LPX64"\n",
lir->lid_id.lgl_oid);
RETURN(rc);
}
- rc = llog_process(llh, d->lpd_cb, d->lpd_data, NULL);
+ if (rec->lrh_index < d->lpd_startcat)
+ /* Skip processing of the logs until startcat */
+ RETURN(0);
+
+ if (d->lpd_startidx > 0) {
+ struct llog_process_cat_data cd;
+
+ cd.lpcd_first_idx = d->lpd_startidx;
+ cd.lpcd_last_idx = 0;
+ rc = llog_process_or_fork(env, llh, d->lpd_cb, d->lpd_data,
+ &cd, false);
+ /* Continue processing the next log from idx 0 */
+ d->lpd_startidx = 0;
+ } else {
+ rc = llog_process_or_fork(env, llh, d->lpd_cb, d->lpd_data,
+ NULL, false);
+ }
+
RETURN(rc);
}
-int llog_cat_process(struct llog_handle *cat_llh, llog_cb_t cb, void *data)
+int llog_cat_process_or_fork(const struct lu_env *env,
+ struct llog_handle *cat_llh,
+ llog_cb_t cb, void *data, int startcat,
+ int startidx, bool fork)
{
struct llog_process_data d;
- struct llog_process_cat_data cd;
struct llog_log_hdr *llh = cat_llh->lgh_hdr;
int rc;
ENTRY;
LASSERT(llh->llh_flags & LLOG_F_IS_CAT);
d.lpd_data = data;
d.lpd_cb = cb;
+ d.lpd_startcat = startcat;
+ d.lpd_startidx = startidx;
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);
cd.lpcd_first_idx = llh->llh_cat_idx;
cd.lpcd_last_idx = 0;
- rc = llog_process(cat_llh, llog_cat_process_cb, &d, &cd);
+ rc = llog_process_or_fork(env, cat_llh, llog_cat_process_cb,
+ &d, &cd, fork);
if (rc != 0)
RETURN(rc);
cd.lpcd_first_idx = 0;
cd.lpcd_last_idx = cat_llh->lgh_last_idx;
- rc = llog_process(cat_llh, llog_cat_process_cb, &d, &cd);
+ rc = llog_process_or_fork(env, cat_llh, llog_cat_process_cb,
+ &d, &cd, fork);
} else {
- rc = llog_process(cat_llh, llog_cat_process_cb, &d, NULL);
+ rc = llog_process_or_fork(env, cat_llh, llog_cat_process_cb,
+ &d, NULL, fork);
}
RETURN(rc);
}
+EXPORT_SYMBOL(llog_cat_process_or_fork);
+
+int llog_cat_process(const struct lu_env *env, struct llog_handle *cat_llh,
+ llog_cb_t cb, void *data, int startcat, int startidx)
+{
+ return llog_cat_process_or_fork(env, cat_llh, cb, data, startcat,
+ startidx, 0);
+}
EXPORT_SYMBOL(llog_cat_process);
#ifdef __KERNEL__
struct llog_process_cat_args *args = data;
struct llog_ctxt *ctxt = args->lpca_ctxt;
struct llog_handle *llh = NULL;
- void *cb = args->lpca_cb;
- struct llog_logid logid;
+ 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");
- logid = *(struct llog_logid *)(args->lpca_arg);
- rc = llog_create(ctxt, &llh, &logid, NULL);
- if (rc) {
- CERROR("llog_create() failed %d\n", rc);
- GOTO(out, rc);
- }
- rc = llog_init_handle(llh, LLOG_F_IS_CAT, NULL);
- if (rc) {
- CERROR("llog_init_handle failed %d\n", rc);
- GOTO(release_llh, rc);
- }
-
- if (cb) {
- rc = llog_cat_process(llh, (llog_cb_t)cb, NULL);
- if (rc != LLOG_PROC_BREAK)
- CERROR("llog_cat_process() failed %d\n", rc);
- } else {
- CWARN("No callback function for recovery\n");
- }
-
- /*
- * Make sure that all cached data is sent.
- */
- llog_sync(ctxt, NULL);
- GOTO(release_llh, rc);
+ 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_put(llh);
- if (rc)
- CERROR("llog_cat_put() failed %d\n", rc);
+ 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;
+ llog_ctxt_put(ctxt);
+ OBD_FREE_PTR(args);
+ return rc;
}
EXPORT_SYMBOL(llog_cat_process_thread);
#endif
-static int llog_cat_reverse_process_cb(struct llog_handle *cat_llh,
- struct llog_rec_hdr *rec, void *data)
+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;
LPX64"\n", lir->lid_id.lgl_oid, lir->lid_id.lgl_ogen,
le32_to_cpu(rec->lrh_index), cat_llh->lgh_id.lgl_oid);
- rc = llog_cat_id2handle(cat_llh, &llh, &lir->lid_id);
+ rc = llog_cat_id2handle(env, cat_llh, &llh, &lir->lid_id);
if (rc) {
CERROR("Cannot find handle for log "LPX64"\n",
lir->lid_id.lgl_oid);
RETURN(rc);
}
- rc = llog_reverse_process(llh, d->lpd_cb, d->lpd_data, NULL);
+ rc = llog_reverse_process(env, llh, d->lpd_cb, d->lpd_data, NULL);
RETURN(rc);
}
-int llog_cat_reverse_process(struct llog_handle *cat_llh,
- llog_cb_t cb, void *data)
+int llog_cat_reverse_process(const struct lu_env *env,
+ struct llog_handle *cat_llh,
+ llog_cb_t cb, void *data)
{
struct llog_process_data d;
struct llog_process_cat_data cd;
cd.lpcd_first_idx = 0;
cd.lpcd_last_idx = cat_llh->lgh_last_idx;
- rc = llog_reverse_process(cat_llh, llog_cat_reverse_process_cb,
- &d, &cd);
+ rc = llog_reverse_process(env, cat_llh,
+ llog_cat_reverse_process_cb,
+ &d, &cd);
if (rc != 0)
RETURN(rc);
cd.lpcd_first_idx = le32_to_cpu(llh->llh_cat_idx);
cd.lpcd_last_idx = 0;
- rc = llog_reverse_process(cat_llh, llog_cat_reverse_process_cb,
- &d, &cd);
+ rc = llog_reverse_process(env, cat_llh,
+ llog_cat_reverse_process_cb,
+ &d, &cd);
} else {
- rc = llog_reverse_process(cat_llh, llog_cat_reverse_process_cb,
- &d, NULL);
+ rc = llog_reverse_process(env, cat_llh,
+ llog_cat_reverse_process_cb,
+ &d, NULL);
}
RETURN(rc);
RETURN(0);
}
+
+/* callback func for llog_process in llog_obd_origin_setup */
+int cat_cancel_cb(const struct lu_env *env, struct llog_handle *cathandle,
+ struct llog_rec_hdr *rec, void *data)
+{
+ struct llog_logid_rec *lir = (struct llog_logid_rec *)rec;
+ struct llog_handle *loghandle;
+ struct llog_log_hdr *llh;
+ int rc, index;
+
+ ENTRY;
+
+ if (rec->lrh_type != LLOG_LOGID_MAGIC) {
+ CERROR("%s: invalid record in catalog\n",
+ loghandle->lgh_ctxt->loc_obd->obd_name);
+ 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);
+
+ rc = llog_cat_id2handle(env, cathandle, &loghandle, &lir->lid_id);
+ if (rc) {
+ CERROR("%s: cannot find handle for llog "LPX64"\n",
+ loghandle->lgh_ctxt->loc_obd->obd_name,
+ lir->lid_id.lgl_oid);
+ if (rc == -ENOENT) {
+ index = rec->lrh_index;
+ goto cat_cleanup;
+ }
+ RETURN(rc);
+ }
+
+ llh = loghandle->lgh_hdr;
+ if ((llh->llh_flags & LLOG_F_ZAP_WHEN_EMPTY) &&
+ (llh->llh_count == 1)) {
+ rc = llog_destroy(env, loghandle);
+ if (rc)
+ CERROR("%s: fail to destroy empty log: rc = %d\n",
+ loghandle->lgh_ctxt->loc_obd->obd_name, rc);
+
+ index = loghandle->u.phd.phd_cookie.lgc_index;
+ llog_close(env, loghandle);
+
+cat_cleanup:
+ LASSERT(index);
+ llog_cat_set_first_idx(cathandle, index);
+ rc = llog_cancel_rec(env, cathandle, index);
+ if (rc == 0)
+ CDEBUG(D_HA,
+ "cancel 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);
+ }
+
+ RETURN(rc);
+}