X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flov%2Flov_log.c;h=ad9bc3ec116104ee7781af953e5402b77ad53585;hb=3a95036038c277873172a3b75824210ec5af17ba;hp=223234be07150664f9f342274cbed55c91b286cd;hpb=c992f94964495f460608ba3d56aa5e313100b481;p=fs%2Flustre-release.git diff --git a/lustre/lov/lov_log.c b/lustre/lov/lov_log.c index 223234b..ad9bc3e 100644 --- a/lustre/lov/lov_log.c +++ b/lustre/lov/lov_log.c @@ -1,6 +1,4 @@ -/* -*- 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. @@ -26,8 +24,10 @@ * 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. + * + * Copyright (c) 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -40,9 +40,6 @@ * Author: Mike Shaver */ -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif #define DEBUG_SUBSYSTEM S_LOV #ifdef __KERNEL__ #include @@ -60,6 +57,7 @@ #include #include #include +#include #include "lov_internal.h" @@ -68,23 +66,25 @@ * 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(const struct lu_env *env, + struct llog_ctxt *ctxt, + struct llog_rec_hdr *rec, + struct lov_stripe_md *lsm, + struct llog_cookie *logcookies, int numcookies) { struct obd_device *obd = ctxt->loc_obd; struct lov_obd *lov = &obd->u.lov; - int i, rc = 0, rc1; + int i, rc = 0, cookies = 0; ENTRY; - LASSERTF(logcookies && numcookies >= lsm->lsm_stripe_count, + LASSERTF(logcookies && numcookies >= lsm->lsm_stripe_count, "logcookies %p, numcookies %d lsm->lsm_stripe_count %d \n", logcookies, numcookies, lsm->lsm_stripe_count); for (i = 0; i < lsm->lsm_stripe_count; i++) { struct lov_oinfo *loi = lsm->lsm_oinfo[i]; - struct obd_device *child = - lov->lov_tgts[loi->loi_ost_idx]->ltd_exp->exp_obd; + struct obd_device *child = + lov->lov_tgts[loi->loi_ost_idx]->ltd_exp->exp_obd; struct llog_ctxt *cctxt = llog_get_context(child, ctxt->loc_idx); /* fill mds unlink/setattr log record */ @@ -92,34 +92,38 @@ static int lov_llog_origin_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec, case MDS_UNLINK_REC: { struct llog_unlink_rec *lur = (struct llog_unlink_rec *)rec; lur->lur_oid = loi->loi_id; - lur->lur_ogen = loi->loi_gr; - break; - } - case MDS_SETATTR_REC: { - struct llog_setattr_rec *lsr = (struct llog_setattr_rec *)rec; - lsr->lsr_oid = loi->loi_id; - lsr->lsr_ogen = loi->loi_gr; + lur->lur_oseq = loi->loi_seq; break; } case MDS_SETATTR64_REC: { struct llog_setattr64_rec *lsr = (struct llog_setattr64_rec *)rec; lsr->lsr_oid = loi->loi_id; - lsr->lsr_ogen = loi->loi_gr; + lsr->lsr_oseq = loi->loi_seq; break; } default: break; } - LASSERT(lsm->lsm_object_gr == loi->loi_gr); - rc1 = llog_add(cctxt, rec, NULL, logcookies + rc, - numcookies - rc); + + /* inject error in llog_obd_add() below */ + if (OBD_FAIL_CHECK(OBD_FAIL_MDS_FAIL_LOV_LOG_ADD)) { + llog_ctxt_put(cctxt); + cctxt = NULL; + } + rc = llog_obd_add(env, cctxt, rec, NULL, logcookies + cookies, + numcookies - cookies); llog_ctxt_put(cctxt); - if (rc1 < 0) - RETURN(rc1); - rc += rc1; + if (rc < 0) { + CERROR("Can't add llog (rc = %d) for stripe %d\n", + rc, cookies); + memset(logcookies + cookies, 0, + sizeof(struct llog_cookie)); + rc = 1; /* skip this cookie */ + } + /* Note that rc is always 1 if llog_obd_add was successful */ + cookies += rc; } - - RETURN(rc); + RETURN(cookies); } static int lov_llog_origin_connect(struct llog_ctxt *ctxt, @@ -132,11 +136,11 @@ static int lov_llog_origin_connect(struct llog_ctxt *ctxt, int i, rc = 0, err = 0; ENTRY; - lov_getref(obd); + obd_getref(obd); for (i = 0; i < lov->desc.ld_tgt_count; i++) { struct obd_device *child; struct llog_ctxt *cctxt; - + if (!lov->lov_tgts[i] || !lov->lov_tgts[i]->ltd_active) continue; if (uuid && !obd_uuid_equals(uuid, &lov->lov_tgts[i]->ltd_uuid)) @@ -146,21 +150,24 @@ static int lov_llog_origin_connect(struct llog_ctxt *ctxt, cctxt = llog_get_context(child, ctxt->loc_idx); rc = llog_connect(cctxt, logid, gen, uuid); llog_ctxt_put(cctxt); - + if (rc) { CERROR("error osc_llog_connect tgt %d (%d)\n", i, rc); - if (!err) + if (!err) err = rc; } } - lov_putref(obd); + obd_putref(obd); RETURN(err); } /* 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(const struct lu_env *env, + struct llog_ctxt *ctxt, + struct lov_stripe_md *lsm, + int count, struct llog_cookie *cookies, + int flags) { struct lov_obd *lov; struct obd_device *obd = ctxt->loc_obd; @@ -171,16 +178,16 @@ static int lov_llog_repl_cancel(struct llog_ctxt *ctxt, struct lov_stripe_md *ls LASSERT(count == lsm->lsm_stripe_count); lov = &obd->u.lov; - lov_getref(obd); + obd_getref(obd); for (i = 0; i < count; i++, cookies++) { struct lov_oinfo *loi = lsm->lsm_oinfo[i]; - struct obd_device *child = + struct obd_device *child = lov->lov_tgts[loi->loi_ost_idx]->ltd_exp->exp_obd; - struct llog_ctxt *cctxt = + struct llog_ctxt *cctxt = llog_get_context(child, ctxt->loc_idx); int err; - err = llog_cancel(cctxt, NULL, 1, cookies, flags); + err = llog_cancel(env, cctxt, NULL, 1, cookies, flags); llog_ctxt_put(cctxt); if (err && lov->lov_tgts[loi->loi_ost_idx]->ltd_active) { CERROR("error: objid "LPX64" subobj "LPX64 @@ -190,92 +197,86 @@ static int lov_llog_repl_cancel(struct llog_ctxt *ctxt, struct lov_stripe_md *ls rc = err; } } - lov_putref(obd); + obd_putref(obd); RETURN(rc); } static struct llog_operations lov_mds_ost_orig_logops = { - lop_add: lov_llog_origin_add, - lop_connect: lov_llog_origin_connect + .lop_obd_add = lov_llog_origin_add, + .lop_connect = lov_llog_origin_connect, }; static struct llog_operations lov_size_repl_logops = { - lop_cancel: lov_llog_repl_cancel + .lop_cancel = lov_llog_repl_cancel, }; int lov_llog_init(struct obd_device *obd, struct obd_llog_group *olg, - struct obd_device *tgt, int count, struct llog_catid *logid, - struct obd_uuid *uuid) + struct obd_device *disk_obd, int *index) { struct lov_obd *lov = &obd->u.lov; struct obd_device *child; int i, rc = 0; ENTRY; - /* allow init only one target at one time */ - LASSERT(uuid); - LASSERT(olg == &obd->obd_olg); - rc = llog_setup(obd, olg, LLOG_MDS_OST_ORIG_CTXT, tgt, 0, NULL, - &lov_mds_ost_orig_logops); - if (rc) - RETURN(rc); + rc = llog_setup(NULL, obd, olg, LLOG_MDS_OST_ORIG_CTXT, disk_obd, + &lov_mds_ost_orig_logops); + if (rc) + RETURN(rc); - rc = llog_setup(obd, olg, LLOG_SIZE_REPL_CTXT, tgt, 0, NULL, - &lov_size_repl_logops); + rc = llog_setup(NULL, obd, olg, LLOG_SIZE_REPL_CTXT, disk_obd, + &lov_size_repl_logops); if (rc) GOTO(err_cleanup, rc); - lov_getref(obd); + obd_getref(obd); /* count may not match lov->desc.ld_tgt_count during dynamic ost add */ for (i = 0; i < lov->desc.ld_tgt_count; i++) { - if (!lov->lov_tgts[i] || !lov->lov_tgts[i]->ltd_active) + if (!lov->lov_tgts[i]) continue; - if (!obd_uuid_equals(uuid, &lov->lov_tgts[i]->ltd_uuid)) + + if (index && i != *index) continue; - LASSERT(lov->lov_tgts[i]->ltd_exp); - child = lov->lov_tgts[i]->ltd_exp->exp_obd; - rc = obd_llog_init(child, &child->obd_olg, tgt, 1, logid, uuid); + child = lov->lov_tgts[i]->ltd_obd; + rc = obd_llog_init(child, &child->obd_olg, disk_obd, &i); if (rc) CERROR("error osc_llog_init idx %d osc '%s' tgt '%s' " - "(rc=%d)\n", i, child->obd_name, tgt->obd_name, - rc); - break; + "(rc=%d)\n", i, child->obd_name, + disk_obd->obd_name, rc); + rc = 0; } - lov_putref(obd); + obd_putref(obd); GOTO(err_cleanup, rc); err_cleanup: if (rc) { - struct llog_ctxt *ctxt = + struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_SIZE_REPL_CTXT); if (ctxt) - llog_cleanup(ctxt); + llog_cleanup(NULL, ctxt); ctxt = llog_get_context(obd, LLOG_MDS_OST_ORIG_CTXT); if (ctxt) - llog_cleanup(ctxt); + llog_cleanup(NULL, ctxt); } return rc; } int lov_llog_finish(struct obd_device *obd, int count) { - struct llog_ctxt *ctxt; - int rc = 0, rc2 = 0; - ENTRY; + struct llog_ctxt *ctxt; - /* cleanup our llogs only if the ctxts have been setup - * (client lov doesn't setup, mds lov does). */ - ctxt = llog_get_context(obd, LLOG_MDS_OST_ORIG_CTXT); - if (ctxt) - rc = llog_cleanup(ctxt); + ENTRY; - ctxt = llog_get_context(obd, LLOG_SIZE_REPL_CTXT); - if (ctxt) - rc2 = llog_cleanup(ctxt); - if (!rc) - rc = rc2; + /* cleanup our llogs only if the ctxts have been setup + * (client lov doesn't setup, mds lov does). */ + ctxt = llog_get_context(obd, LLOG_MDS_OST_ORIG_CTXT); + if (ctxt) + llog_cleanup(NULL, ctxt); - /* lov->tgt llogs are cleaned during osc_cleanup. */ - RETURN(rc); + ctxt = llog_get_context(obd, LLOG_SIZE_REPL_CTXT); + if (ctxt) + llog_cleanup(NULL, ctxt); + + /* lov->tgt llogs are cleaned during osc_cleanup. */ + RETURN(0); }