* we need to keep cookies in stripe order, even if some are NULL, so that
* the right cookies are passed back to the right OSTs at the client side.
* Unset cookies should be all-zero (which will never occur naturally). */
-static int lov_llog_origin_add(struct llog_ctxt *ctxt,
- struct llog_rec_hdr *rec, struct lov_stripe_md *lsm,
- struct llog_cookie *logcookies, int numcookies)
+static int lov_llog_origin_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
+ void *buf, struct llog_cookie *logcookies,
+ int numcookies, void *data,
+ struct rw_semaphore **lock, int *lock_count)
{
struct obd_device *obd = ctxt->loc_obd;
struct lov_obd *lov = &obd->u.lov;
struct lov_oinfo *loi;
struct llog_unlink_rec *lur;
+ struct lov_stripe_md *lsm = (struct lov_stripe_md *)buf;
int i, rc = 0;
ENTRY;
LASSERT(logcookies && numcookies >= lsm->lsm_stripe_count);
+ /* We need this to serialize llog records between parallel unlinks so
+ * we can replay llog records in strict transno and llog order. If
+ * and when we want to make this more scalable we need to lock and
+ * write records in strictly ost_idx order not lsm order. Consider
+ * file 1 on ost_idx [1, 2, 3, 4] and file 2 on ost_idx [3, 4, 1, 2] */
+ down(&lov->lov_llog_sem);
for (i = 0,loi = lsm->lsm_oinfo; i < lsm->lsm_stripe_count; i++,loi++) {
- struct obd_device *child = lov->tgts[loi->loi_ost_idx].ltd_exp->exp_obd;
- struct llog_ctxt *cctxt = llog_get_context(child, ctxt->loc_idx);
+ struct obd_device *child =
+ lov->tgts[loi->loi_ost_idx].ltd_exp->exp_obd;
+ struct llog_ctxt *cctxt;
+ cctxt = llog_get_context(&child->obd_llogs, ctxt->loc_idx);
lur->lur_oid = loi->loi_id;
lur->lur_ogen = loi->loi_gr;
+ LASSERT(lsm->lsm_object_gr == loi->loi_gr);
rc += llog_add(cctxt, &lur->lur_hdr, NULL, logcookies + rc,
- numcookies - rc);
-
+ numcookies - rc, NULL,
+ lock != NULL ? lock + rc : NULL, lock_count);
}
+ up(&lov->lov_llog_sem);
OBD_FREE(lur, sizeof(*lur));
RETURN(rc);
}
static int lov_llog_origin_connect(struct llog_ctxt *ctxt, int count,
- struct llog_logid *logid,
- struct llog_gen *gen,
- struct obd_uuid *uuid)
+ struct llog_logid *logid,
+ struct llog_gen *gen, struct obd_uuid *uuid)
{
struct obd_device *obd = ctxt->loc_obd;
struct lov_obd *lov = &obd->u.lov;
+ struct lov_tgt_desc *tgt;
int i, rc = 0;
ENTRY;
LASSERT(lov->desc.ld_tgt_count == count);
- for (i = 0; i < lov->desc.ld_tgt_count; i++) {
- struct obd_device *child = lov->tgts[i].ltd_exp->exp_obd;
- struct llog_ctxt *cctxt = llog_get_context(child, ctxt->loc_idx);
+ for (i = 0, tgt = lov->tgts; i < lov->desc.ld_tgt_count; i++, tgt++) {
+ struct obd_device *child;
+ struct llog_ctxt *cctxt;
+
+ if (!tgt->active)
+ continue;
+ child = tgt->ltd_exp->exp_obd;
+ cctxt = llog_get_context(&child->obd_llogs, ctxt->loc_idx);
if (uuid && !obd_uuid_equals(uuid, &lov->tgts[i].uuid))
continue;
}
/* the replicators commit callback */
-static int lov_llog_repl_cancel(struct llog_ctxt *ctxt, struct lov_stripe_md *lsm,
- int count, struct llog_cookie *cookies, int flags)
+static int lov_llog_repl_cancel(struct llog_ctxt *ctxt, int count,
+ struct llog_cookie *cookies, int flags,
+ void *data)
{
+ struct lov_stripe_md *lsm = (struct lov_stripe_md *)data;
struct lov_obd *lov;
struct obd_device *obd = ctxt->loc_obd;
struct lov_oinfo *loi;
loi = lsm->lsm_oinfo;
lov = &obd->u.lov;
for (i = 0; i < count; i++, cookies++, loi++) {
- struct obd_device *child = lov->tgts[loi->loi_ost_idx].ltd_exp->exp_obd;
- struct llog_ctxt *cctxt = llog_get_context(child, ctxt->loc_idx);
+ struct obd_device *child =
+ lov->tgts[loi->loi_ost_idx].ltd_exp->exp_obd;
+ struct llog_ctxt *cctxt;
int err;
- err = llog_cancel(cctxt, NULL, 1, cookies, flags);
+ cctxt = llog_get_context(&child->obd_llogs, ctxt->loc_idx);
+ err = llog_cancel(cctxt, 1, cookies, flags, NULL);
if (err && lov->tgts[loi->loi_ost_idx].active) {
CERROR("error: objid "LPX64" subobj "LPX64
" on OST idx %d: rc = %d\n", lsm->lsm_object_id,
lop_cancel: lov_llog_repl_cancel
};
-
-int lov_llog_init(struct obd_device *obd, struct obd_device *tgt,
- int count, struct llog_catid *logid)
+int lov_llog_init(struct obd_device *obd, struct obd_llogs *llogs,
+ struct obd_device *tgt, int count, struct llog_catid *logid)
{
struct lov_obd *lov = &obd->u.lov;
+ struct lov_tgt_desc *ctgt;
int i, rc = 0;
ENTRY;
-
- rc = llog_setup(obd, LLOG_UNLINK_ORIG_CTXT, tgt, 0, NULL,
- &lov_unlink_orig_logops);
+
+ rc = obd_llog_setup(obd, llogs, LLOG_UNLINK_ORIG_CTXT, tgt, 0, NULL,
+ &lov_unlink_orig_logops);
if (rc)
RETURN(rc);
- rc = llog_setup(obd, LLOG_SIZE_REPL_CTXT, tgt, 0, NULL,
- &lov_size_repl_logops);
+ rc = obd_llog_setup(obd, llogs, LLOG_SIZE_REPL_CTXT, tgt, 0, NULL,
+ &lov_size_repl_logops);
if (rc)
RETURN(rc);
LASSERT(lov->desc.ld_tgt_count == count);
- for (i = 0; i < lov->desc.ld_tgt_count; i++) {
- struct obd_device *child = lov->tgts[i].ltd_exp->exp_obd;
- rc = obd_llog_init(child, tgt, 1, logid + i);
+ for (i = 0, ctgt = lov->tgts; i < lov->desc.ld_tgt_count; i++, ctgt++) {
+ struct obd_device *child;
+
+ if (!ctgt->active)
+ continue;
+ child = ctgt->ltd_exp->exp_obd;
+ rc = obd_llog_init(child, &child->obd_llogs, tgt, 1, logid + i);
if (rc) {
CERROR("error osc_llog_init %d\n", i);
break;
RETURN(rc);
}
-int lov_llog_finish(struct obd_device *obd, int count)
+int lov_llog_finish(struct obd_device *obd, struct obd_llogs *llogs, int count)
{
struct lov_obd *lov = &obd->u.lov;
+ struct lov_tgt_desc *tgt;
int i, rc = 0;
ENTRY;
-
- rc = llog_cleanup(llog_get_context(obd, LLOG_UNLINK_ORIG_CTXT));
+
+ rc = obd_llog_cleanup(llog_get_context(llogs, LLOG_UNLINK_ORIG_CTXT));
if (rc)
RETURN(rc);
- rc = llog_cleanup(llog_get_context(obd, LLOG_SIZE_REPL_CTXT));
+ rc = obd_llog_cleanup(llog_get_context(llogs, LLOG_SIZE_REPL_CTXT));
if (rc)
RETURN(rc);
- LASSERT(lov->desc.ld_tgt_count == count);
- for (i = 0; i < lov->desc.ld_tgt_count; i++) {
- struct obd_device *child = lov->tgts[i].ltd_exp->exp_obd;
- rc = obd_llog_finish(child, 1);
+ if (lov->desc.ld_tgt_count != count) {
+ CERROR("LOV tgt count != passed tgt count (%d != %d)\n",
+ lov->desc.ld_tgt_count, count);
+ count = MIN(lov->desc.ld_tgt_count, count);
+ }
+ for (i = 0, tgt = lov->tgts; i < count; i++, tgt++) {
+ struct obd_device *child;
+
+ if (!tgt->active)
+ continue;
+ child = tgt->ltd_exp->exp_obd;
+ rc = obd_llog_finish(child, &child->obd_llogs, 1);
if (rc) {
- CERROR("error osc_llog_finish %d\n", i);
+ CERROR("osc_llog_finish error; index=%d; rc=%d\n",
+ i, rc);
break;
}
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff