X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fllog_obd.c;h=ca20d5d617975740360dfa2ce3a0508b3c864832;hb=094c0b74fcc554ec856f69032ccc0c95fe383183;hp=cc27ba997aa7319c52a4315437c10967794d871a;hpb=81c713adebdb2a4c9340ba28a9c8f9310c9e76a0;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/llog_obd.c b/lustre/obdclass/llog_obd.c index cc27ba9..ca20d5d 100644 --- a/lustre/obdclass/llog_obd.c +++ b/lustre/obdclass/llog_obd.c @@ -1,25 +1,37 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (C) 2005 Cluster File Systems, Inc. + * GPL HEADER START * - * This file is part of the Lustre file system, http://www.lustre.org - * Lustre is a trademark of Cluster File Systems, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * You may have signed or agreed to another license before downloading - * this software. If so, you are bound by the terms and conditions - * of that agreement, and the following does not apply to you. See the - * LICENSE file included with this distribution for more information. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * If you did not agree to a different license, then this copy of Lustre - * is open source software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * In either case, Lustre is distributed in the hope that it will be - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * license text for more details. + * You should have received a copy of the GNU General Public License + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + * GPL HEADER END + */ +/* + * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. */ #define DEBUG_SUBSYSTEM S_LOG @@ -54,15 +66,16 @@ static struct llog_ctxt* llog_new_ctxt(struct obd_device *obd) static void llog_ctxt_destroy(struct llog_ctxt *ctxt) { - if (ctxt->loc_exp) + if (ctxt->loc_exp) { class_export_put(ctxt->loc_exp); + ctxt->loc_exp = NULL; + } if (ctxt->loc_imp) { class_import_put(ctxt->loc_imp); ctxt->loc_imp = NULL; } - + LASSERT(ctxt->loc_llcd == NULL); OBD_FREE_PTR(ctxt); - return; } int __llog_ctxt_put(struct llog_ctxt *ctxt) @@ -82,7 +95,14 @@ int __llog_ctxt_put(struct llog_ctxt *ctxt) obd = ctxt->loc_obd; spin_lock(&obd->obd_dev_lock); spin_unlock(&obd->obd_dev_lock); /* sync with llog ctxt user thread */ - LASSERT(obd->obd_stopping == 1 || obd->obd_set_up == 0); + + /* obd->obd_starting is needed for the case of cleanup + * in error case while obd is starting up. */ + LASSERTF(obd->obd_starting == 1 || + obd->obd_stopping == 1 || obd->obd_set_up == 0, + "wrong obd state: %d/%d/%d\n", !!obd->obd_starting, + !!obd->obd_stopping, !!obd->obd_set_up); + /* cleanup the llog ctxt here */ if (CTXTP(ctxt, cleanup)) rc = CTXTP(ctxt, cleanup)(ctxt); @@ -100,20 +120,29 @@ int llog_cleanup(struct llog_ctxt *ctxt) int rc, idx; ENTRY; - if (!ctxt) { - CERROR("No ctxt\n"); - RETURN(-ENODEV); - } + LASSERT(ctxt != NULL); + LASSERT(ctxt != LP_POISON); olg = ctxt->loc_olg; + LASSERT(olg != NULL); + LASSERT(olg != LP_POISON); + idx = ctxt->loc_idx; - /* banlance the ctxt get when calling llog_cleanup */ + /* + * Banlance the ctxt get when calling llog_cleanup() + */ + LASSERT(atomic_read(&ctxt->loc_refcount) < 0x5a5a5a); LASSERT(atomic_read(&ctxt->loc_refcount) > 1); llog_ctxt_put(ctxt); - /* try to free the ctxt */ + /* + * Try to free the ctxt. + */ rc = __llog_ctxt_put(ctxt); + if (rc) + CERROR("Error %d while cleaning up ctxt %p\n", + rc, ctxt); l_wait_event(olg->olg_waitq, llog_group_ctxt_null(olg, idx), &lwi); @@ -122,61 +151,79 @@ int llog_cleanup(struct llog_ctxt *ctxt) } EXPORT_SYMBOL(llog_cleanup); -int llog_setup(struct obd_device *obd, struct obd_llog_group *olg, int index, - struct obd_device *disk_obd, int count, struct llog_logid *logid, - struct llog_operations *op) +int llog_setup_named(struct obd_device *obd, struct obd_llog_group *olg, + int index, struct obd_device *disk_obd, int count, + struct llog_logid *logid, const char *logname, + struct llog_operations *op) { - int rc = 0; struct llog_ctxt *ctxt; + int rc = 0; ENTRY; if (index < 0 || index >= LLOG_MAX_CTXTS) - RETURN(-EFAULT); + RETURN(-EINVAL); LASSERT(olg != NULL); - ctxt = llog_group_get_ctxt(olg, index); - /* in some recovery cases, obd_llog_ctxt might already be set, - * but llogs might still be zero, for example in obd_filter recovery */ - if (ctxt) { - /* mds_lov_update_mds might call here multiple times. So if the - llog is already set up then don't to do it again. */ - CDEBUG(D_CONFIG, "obd %s ctxt %d already set up\n", - obd->obd_name, index); - LASSERT(ctxt->loc_olg == olg); - LASSERT(ctxt->loc_obd == obd); - LASSERT(ctxt->loc_exp == disk_obd->obd_self_export); - LASSERT(ctxt->loc_logops == op); - llog_ctxt_put(ctxt); - GOTO(out, rc = 0); - } ctxt = llog_new_ctxt(obd); if (!ctxt) - GOTO(out, rc = -ENOMEM); + RETURN(-ENOMEM); - rc = llog_group_set_ctxt(olg, ctxt, index); - if (rc) { - llog_ctxt_destroy(ctxt); - if (rc == -EEXIST) - rc = 0; - GOTO(out, rc); - } ctxt->loc_obd = obd; - ctxt->loc_exp = class_export_get(disk_obd->obd_self_export); ctxt->loc_olg = olg; ctxt->loc_idx = index; ctxt->loc_logops = op; sema_init(&ctxt->loc_sem, 1); + ctxt->loc_exp = class_export_get(disk_obd->obd_self_export); - if (op->lop_setup) - rc = op->lop_setup(obd, olg, index, disk_obd, count, logid); - + rc = llog_group_set_ctxt(olg, ctxt, index); if (rc) { llog_ctxt_destroy(ctxt); + if (rc == -EEXIST) { + ctxt = llog_group_get_ctxt(olg, index); + if (ctxt) { + /* + * mds_lov_update_desc() might call here multiple + * times. So if the llog is already set up then + * don't to do it again. + */ + CDEBUG(D_CONFIG, "obd %s ctxt %d already set up\n", + obd->obd_name, index); + LASSERT(ctxt->loc_olg == olg); + LASSERT(ctxt->loc_obd == obd); + LASSERT(ctxt->loc_exp == disk_obd->obd_self_export); + LASSERT(ctxt->loc_logops == op); + llog_ctxt_put(ctxt); + } + rc = 0; + } + RETURN(rc); } -out: + + if (OBD_FAIL_CHECK(OBD_FAIL_OBD_LLOG_SETUP)) { + rc = -ENOTSUPP; + } else { + if (op->lop_setup) + rc = op->lop_setup(obd, olg, index, disk_obd, count, + logid, logname); + } + + if (rc) { + CERROR("obd %s ctxt %d lop_setup=%p failed %d\n", + obd->obd_name, index, op->lop_setup, rc); + llog_ctxt_put(ctxt); + } + RETURN(rc); } +EXPORT_SYMBOL(llog_setup_named); + +int llog_setup(struct obd_device *obd, struct obd_llog_group *olg, + int index, struct obd_device *disk_obd, int count, + struct llog_logid *logid, struct llog_operations *op) +{ + return llog_setup_named(obd,olg,index,disk_obd,count,logid,NULL,op); +} EXPORT_SYMBOL(llog_setup); int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp) @@ -195,23 +242,24 @@ int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp) EXPORT_SYMBOL(llog_sync); int llog_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec, - struct lov_stripe_md *lsm, struct llog_cookie *logcookies, - int numcookies) + struct lov_stripe_md *lsm, struct llog_cookie *logcookies, + int numcookies) { - __u32 cap; - int rc; + int raised, rc; ENTRY; if (!ctxt) { CERROR("No ctxt\n"); RETURN(-ENODEV); } - + CTXT_CHECK_OP(ctxt, add, -EOPNOTSUPP); - cap = current->cap_effective; - cap_raise(current->cap_effective, CAP_SYS_RESOURCE); + raised = cfs_cap_raised(CFS_CAP_SYS_RESOURCE); + if (!raised) + cfs_cap_raise(CFS_CAP_SYS_RESOURCE); rc = CTXTP(ctxt, add)(ctxt, rec, lsm, logcookies, numcookies); - current->cap_effective = cap; + if (!raised) + cfs_cap_lower(CFS_CAP_SYS_RESOURCE); RETURN(rc); } EXPORT_SYMBOL(llog_add); @@ -226,7 +274,7 @@ int llog_cancel(struct llog_ctxt *ctxt, struct lov_stripe_md *lsm, CERROR("No ctxt\n"); RETURN(-ENODEV); } - + CTXT_CHECK_OP(ctxt, cancel, -EOPNOTSUPP); rc = CTXTP(ctxt, cancel)(ctxt, lsm, count, cookies, flags); RETURN(rc); @@ -285,7 +333,7 @@ static int cat_cancel_cb(struct llog_handle *cathandle, // XXX how to set exports int llog_obd_origin_setup(struct obd_device *obd, struct obd_llog_group *olg, int index, struct obd_device *disk_obd, int count, - struct llog_logid *logid) + struct llog_logid *logid, const char *name) { struct llog_ctxt *ctxt; struct llog_handle *handle; @@ -300,15 +348,15 @@ int llog_obd_origin_setup(struct obd_device *obd, struct obd_llog_group *olg, LASSERT(olg != NULL); ctxt = llog_group_get_ctxt(olg, index); - - LASSERT(ctxt); + if (!ctxt) + RETURN(-ENODEV); llog_gen_init(ctxt); - if (logid->lgl_oid) + if (logid && logid->lgl_oid) { rc = llog_create(ctxt, &handle, logid, NULL); - else { - rc = llog_create(ctxt, &handle, NULL, NULL); - if (!rc) + } else { + rc = llog_create(ctxt, &handle, NULL, (char *)name); + if (!rc && logid) *logid = handle->lgh_id; } if (rc) @@ -323,10 +371,11 @@ int llog_obd_origin_setup(struct obd_device *obd, struct obd_llog_group *olg, rc = llog_process(handle, (llog_cb_t)cat_cancel_cb, NULL, NULL); if (rc) - CERROR("llog_process with cat_cancel_cb failed: %d\n", rc); + CERROR("llog_process() with cat_cancel_cb failed: %d\n", rc); + GOTO(out, rc); out: llog_ctxt_put(ctxt); - RETURN(rc); + return rc; } EXPORT_SYMBOL(llog_obd_origin_setup); @@ -384,48 +433,46 @@ int llog_obd_origin_add(struct llog_ctxt *ctxt, cathandle = ctxt->loc_handle; LASSERT(cathandle != NULL); rc = llog_cat_add_rec(cathandle, rec, logcookies, NULL); - if (rc != 1) + if ((rc < 0) || (!logcookies && rc)) CERROR("write one catalog record failed: %d\n", rc); RETURN(rc); } EXPORT_SYMBOL(llog_obd_origin_add); int llog_cat_initialize(struct obd_device *obd, struct obd_llog_group *olg, - int count, struct obd_uuid *uuid) + int idx, struct obd_uuid *uuid) { char name[32] = CATLIST; - struct llog_catid *idarray = NULL; - int size = sizeof(*idarray) * count; + struct llog_catid idarray; int rc; ENTRY; - if (count) { - OBD_VMALLOC(idarray, size); - if (!idarray) - RETURN(-ENOMEM); - } - - rc = llog_get_cat_list(obd, obd, name, count, idarray); + mutex_down(&olg->olg_cat_processing); + rc = llog_get_cat_list(obd, obd, name, idx, 1, &idarray); if (rc) { CERROR("rc: %d\n", rc); GOTO(out, rc); } - rc = obd_llog_init(obd, olg, obd, count, idarray, uuid); + CDEBUG(D_INFO, "%s: Init llog for %s/%d - catid "LPX64"/"LPX64":%x\n", + obd->obd_name, uuid->uuid, idx, idarray.lci_logid.lgl_oid, + idarray.lci_logid.lgl_ogr, idarray.lci_logid.lgl_ogen); + + rc = obd_llog_init(obd, olg, obd, 1, &idarray, uuid); if (rc) { CERROR("rc: %d\n", rc); GOTO(out, rc); } - rc = llog_put_cat_list(obd, obd, name, count, idarray); + rc = llog_put_cat_list(obd, obd, name, idx, 1, &idarray); if (rc) { CERROR("rc: %d\n", rc); GOTO(out, rc); } out: - if (idarray) - OBD_VFREE(idarray, size); + mutex_up(&olg->olg_cat_processing); + RETURN(rc); } EXPORT_SYMBOL(llog_cat_initialize); @@ -455,4 +502,3 @@ int obd_llog_finish(struct obd_device *obd, int count) RETURN(rc); } EXPORT_SYMBOL(obd_llog_finish); -