X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_log.h;h=eddaeefaf64330e1fe3c8ce1fd373f87fc5ed1f5;hb=a7a2133bfab42eba077f1b8d5c991c651c8028c3;hp=31bd54306878ad92d591e8faf8c6a15dca87dc8b;hpb=c9842fdc5244e38593f0b12468e87f23853dba9f;p=fs%2Flustre-release.git diff --git a/lustre/include/lustre_log.h b/lustre/include/lustre_log.h index 31bd543..eddaeef 100644 --- a/lustre/include/lustre_log.h +++ b/lustre/include/lustre_log.h @@ -1,25 +1,41 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (C) 2001 Cluster File Systems, Inc. + * GPL HEADER START * - * This file is part of Lustre, http://www.lustre.org. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Lustre is free 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 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. * - * 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 - * GNU General Public License for more details. + * 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). * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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 * - * Generic infrastructure for managing a collection of logs. + * 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. * + * lustre/include/lustre_log.h + * + * Generic infrastructure for managing a collection of logs. * These logs are used for: * * - orphan recovery: OST adds record on create @@ -96,16 +112,49 @@ extern int llog_cancel_rec(struct llog_handle *loghandle, int index); extern int llog_close(struct llog_handle *cathandle); extern int llog_get_size(struct llog_handle *loghandle); -/* llog_cat.c - catalog api */ +/* llog_cat.c - catalog api */ struct llog_process_data { - void *lpd_data; - llog_cb_t lpd_cb; + /** + * Any useful data needed while processing catalog. This is + * passed later to process callback. + */ + void *lpd_data; + /** + * Catalog process callback function, called for each record + * in catalog. + */ + llog_cb_t lpd_cb; + /** + * Start processing the catalog from startcat/startidx + */ + int lpd_startcat; + int lpd_startidx; }; struct llog_process_cat_data { - int first_idx; - int last_idx; - /* to process catalog across zero record */ + /** + * Temporary stored first_idx while scanning log. + */ + int lpcd_first_idx; + /** + * Temporary stored last_idx while scanning log. + */ + int lpcd_last_idx; +}; + +struct llog_process_cat_args { + /** + * Llog context used in recovery thread on OST (recov_thread.c) + */ + struct llog_ctxt *lpca_ctxt; + /** + * Llog callback used in recovery thread on OST (recov_thread.c) + */ + void *lpca_cb; + /** + * Data pointer for llog callback. + */ + void *lpca_arg; }; int llog_cat_put(struct llog_handle *cathandle); @@ -113,13 +162,19 @@ int llog_cat_add_rec(struct llog_handle *cathandle, struct llog_rec_hdr *rec, struct llog_cookie *reccookie, void *buf); int llog_cat_cancel_records(struct llog_handle *cathandle, int count, struct llog_cookie *cookies); -int llog_cat_process(struct llog_handle *cat_llh, llog_cb_t cb, void *data); +int llog_cat_process(struct llog_handle *cat_llh, llog_cb_t cb, void *data, + int startcat, int startidx); +int llog_cat_process_thread(void *data); int llog_cat_reverse_process(struct llog_handle *cat_llh, llog_cb_t cb, void *data); int llog_cat_set_first_idx(struct llog_handle *cathandle, int index); /* llog_obd.c */ +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 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 obd_device *disk_obd, int count, struct llog_logid *logid, struct llog_operations *op); int __llog_ctxt_put(struct llog_ctxt *ctxt); int llog_cleanup(struct llog_ctxt *); @@ -130,18 +185,18 @@ int llog_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec, int llog_cancel(struct llog_ctxt *, struct lov_stripe_md *lsm, int count, struct llog_cookie *cookies, int flags); -int llog_obd_origin_setup(struct obd_device *obd, struct obd_llog_group *olg, +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); int llog_obd_origin_cleanup(struct llog_ctxt *ctxt); int llog_obd_origin_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec, struct lov_stripe_md *lsm, struct llog_cookie *logcookies, int numcookies); int llog_cat_initialize(struct obd_device *obd, struct obd_llog_group *olg, - int count, struct obd_uuid *uuid); -int obd_llog_init(struct obd_device *obd, int group, - struct obd_device *disk_obd, int count, + int idx, struct obd_uuid *uuid); +int obd_llog_init(struct obd_device *obd, struct obd_llog_group *olg, + struct obd_device *disk_obd, int count, struct llog_catid *logid, struct obd_uuid *uuid); int obd_llog_finish(struct obd_device *obd, int count); @@ -154,7 +209,7 @@ int llog_catalog_list(struct obd_device *obd, int count, /* llog_net.c */ int llog_initiator_connect(struct llog_ctxt *ctxt); int llog_receptor_accept(struct llog_ctxt *ctxt, struct obd_import *imp); -int llog_origin_connect(struct llog_ctxt *ctxt, int count, +int llog_origin_connect(struct llog_ctxt *ctxt, struct llog_logid *logid, struct llog_gen *gen, struct obd_uuid *uuid); int llog_handle_connect(struct ptlrpc_request *req); @@ -164,9 +219,9 @@ int llog_obd_repl_cancel(struct llog_ctxt *ctxt, struct lov_stripe_md *lsm, int count, struct llog_cookie *cookies, int flags); int llog_obd_repl_sync(struct llog_ctxt *ctxt, struct obd_export *exp); -int llog_repl_connect(struct llog_ctxt *ctxt, int count, - struct llog_logid *logid, struct llog_gen *gen, - struct obd_uuid *uuid); +int llog_obd_repl_connect(struct llog_ctxt *ctxt, + struct llog_logid *logid, struct llog_gen *gen, + struct obd_uuid *uuid); struct llog_operations { int (*lop_write_rec)(struct llog_handle *loghandle, @@ -183,9 +238,9 @@ struct llog_operations { int (*lop_close)(struct llog_handle *handle); int (*lop_read_header)(struct llog_handle *handle); - int (*lop_setup)(struct obd_device *obd, struct obd_llog_group *olg, + int (*lop_setup)(struct obd_device *obd, struct obd_llog_group *olg, int ctxt_idx, struct obd_device *disk_obd, int count, - struct llog_logid *logid); + struct llog_logid *logid, const char *name); int (*lop_sync)(struct llog_ctxt *ctxt, struct obd_export *exp); int (*lop_cleanup)(struct llog_ctxt *ctxt); int (*lop_add)(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec, @@ -193,7 +248,7 @@ struct llog_operations { struct llog_cookie *logcookies, int numcookies); int (*lop_cancel)(struct llog_ctxt *ctxt, struct lov_stripe_md *lsm, int count, struct llog_cookie *cookies, int flags); - int (*lop_connect)(struct llog_ctxt *ctxt, int count, + int (*lop_connect)(struct llog_ctxt *ctxt, struct llog_logid *logid, struct llog_gen *gen, struct obd_uuid *uuid); /* XXX add 2 more: commit callbacks and llog recovery functions */ @@ -202,32 +257,120 @@ struct llog_operations { /* llog_lvfs.c */ extern struct llog_operations llog_lvfs_ops; int llog_get_cat_list(struct obd_device *obd, struct obd_device *disk_obd, - char *name, int count, struct llog_catid *idarray); + char *name, int idx, int count, + struct llog_catid *idarray); + +int llog_put_cat_list(struct obd_device *obd, struct obd_device *disk_obd, + char *name, int idx, int count, struct llog_catid *idarray); struct llog_ctxt { int loc_idx; /* my index the obd array of ctxt's */ struct llog_gen loc_gen; struct obd_device *loc_obd; /* points back to the containing obd*/ - struct obd_llog_group *loc_olg; /* group containing that ctxt */ + struct obd_llog_group *loc_olg; /* group containing that ctxt */ struct obd_export *loc_exp; /* parent "disk" export (e.g. MDS) */ struct obd_import *loc_imp; /* to use in RPC's: can be backward pointing import */ struct llog_operations *loc_logops; struct llog_handle *loc_handle; + struct llog_commit_master *loc_lcm; struct llog_canceld_ctxt *loc_llcd; struct semaphore loc_sem; /* protects loc_llcd and loc_imp */ - atomic_t loc_refcount; - struct llog_commit_master *loc_lcm; + atomic_t loc_refcount; void *llog_proc_cb; }; -#ifndef __KERNEL__ +#define LCM_NAME_SIZE 64 + +struct llog_commit_master { + /** + * Thread control flags (start, stop, etc.) + */ + long lcm_flags; + /** + * Number of llcds onthis lcm. + */ + atomic_t lcm_count; + /** + * The refcount for lcm + */ + atomic_t lcm_refcount; + /** + * Thread control structure. Used for control commit thread. + */ + struct ptlrpcd_ctl lcm_pc; + /** + * Lock protecting list of llcds. + */ + spinlock_t lcm_lock; + /** + * Llcds in flight for debugging purposes. + */ + struct list_head lcm_llcds; + /** + * Commit thread name buffer. Only used for thread start. + */ + char lcm_name[LCM_NAME_SIZE]; +}; -#define cap_raise(c, flag) do {} while(0) +static inline struct llog_commit_master +*lcm_get(struct llog_commit_master *lcm) +{ + LASSERT(atomic_read(&lcm->lcm_refcount) > 0); + atomic_inc(&lcm->lcm_refcount); + return lcm; +} -#define CAP_SYS_RESOURCE 24 +static inline void +lcm_put(struct llog_commit_master *lcm) +{ + if (!atomic_dec_and_test(&lcm->lcm_refcount)) { + return ; + } + OBD_FREE_PTR(lcm); +} -#endif /* !__KERNEL__ */ +struct llog_canceld_ctxt { + /** + * Llog context this llcd is attached to. Used for accessing + * ->loc_import and others in process of canceling cookies + * gathered in this llcd. + */ + struct llog_ctxt *llcd_ctxt; + /** + * Cancel thread control stucture pointer. Used for accessing + * it to see if should stop processing and other needs. + */ + struct llog_commit_master *llcd_lcm; + /** + * Maximal llcd size. Used in calculations on how much of room + * left in llcd to cookie comming cookies. + */ + int llcd_size; + /** + * Link to lcm llcds list. + */ + struct list_head llcd_list; + /** + * Current llcd size while gathering cookies. This should not be + * more than ->llcd_size. Used for determining if we need to + * send this llcd (if full) and allocate new one. This is also + * used for copying new cookie at the end of buffer. + */ + int llcd_cookiebytes; + /** + * Pointer to the start of cookies buffer. + */ + struct llog_cookie llcd_cookies[0]; +}; + +/* ptlrpc/recov_thread.c */ +extern struct llog_commit_master *llog_recov_thread_init(char *name); +extern void llog_recov_thread_fini(struct llog_commit_master *lcm, + int force); +extern int llog_recov_thread_start(struct llog_commit_master *lcm); +extern void llog_recov_thread_stop(struct llog_commit_master *lcm, + int force); static inline void llog_gen_init(struct llog_ctxt *ctxt) { @@ -294,10 +437,10 @@ static inline void llog_ctxt_put(struct llog_ctxt *ctxt) { if (ctxt == NULL) return; - CDEBUG(D_INFO, "PUTting ctxt %p : new refcount %d\n", ctxt, - atomic_read(&ctxt->loc_refcount) - 1); LASSERT(atomic_read(&ctxt->loc_refcount) > 0); LASSERT(atomic_read(&ctxt->loc_refcount) < 0x5a5a5a); + CDEBUG(D_INFO, "PUTting ctxt %p : new refcount %d\n", ctxt, + atomic_read(&ctxt->loc_refcount) - 1); __llog_ctxt_put(ctxt); } @@ -305,6 +448,7 @@ static inline void llog_group_init(struct obd_llog_group *olg, int group) { cfs_waitq_init(&olg->olg_waitq); spin_lock_init(&olg->olg_lock); + sema_init(&olg->olg_cat_processing, 1); olg->olg_group = group; } @@ -312,7 +456,7 @@ static inline void llog_group_set_export(struct obd_llog_group *olg, struct obd_export *exp) { LASSERT(exp != NULL); - + spin_lock(&olg->olg_lock); if (olg->olg_exp != NULL && olg->olg_exp != exp) CWARN("%s: export for group %d is changed: 0x%p -> 0x%p\n", @@ -327,7 +471,7 @@ static inline int llog_group_set_ctxt(struct obd_llog_group *olg, { LASSERT(index >= 0 && index < LLOG_MAX_CTXTS); - spin_lock(&olg->olg_lock); + spin_lock(&olg->olg_lock); if (olg->olg_ctxts[index] != NULL) { spin_unlock(&olg->olg_lock); return -EEXIST; @@ -344,7 +488,7 @@ static inline struct llog_ctxt *llog_group_get_ctxt(struct obd_llog_group *olg, LASSERT(index >= 0 && index < LLOG_MAX_CTXTS); - spin_lock(&olg->olg_lock); + spin_lock(&olg->olg_lock); if (olg->olg_ctxts[index] == NULL) { ctxt = NULL; } else { @@ -376,8 +520,7 @@ static inline int llog_write_rec(struct llog_handle *handle, int numcookies, void *buf, int idx) { struct llog_operations *lop; - __u32 cap; - int rc, buflen; + int raised, rc, buflen; ENTRY; rc = llog_handle2ops(handle, &lop); @@ -387,6 +530,7 @@ static inline int llog_write_rec(struct llog_handle *handle, if (lop->lop_write_rec == NULL) RETURN(-EOPNOTSUPP); + /* FIXME: Why doesn't caller just set the right lrh_len itself? */ if (buf) buflen = rec->lrh_len + sizeof(struct llog_rec_hdr) + sizeof(struct llog_rec_tail); @@ -394,10 +538,12 @@ static inline int llog_write_rec(struct llog_handle *handle, buflen = rec->lrh_len; LASSERT(size_round(buflen) == buflen); - 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 = lop->lop_write_rec(handle, rec, logcookies, numcookies, buf, idx); - current->cap_effective = cap; + if (!raised) + cfs_cap_lower(CFS_CAP_SYS_RESOURCE); RETURN(rc); } @@ -493,8 +639,7 @@ static inline int llog_create(struct llog_ctxt *ctxt, struct llog_handle **res, struct llog_logid *logid, char *name) { struct llog_operations *lop; - __u32 cap; - int rc; + int raised, rc; ENTRY; rc = llog_obd2ops(ctxt, &lop); @@ -503,14 +648,16 @@ static inline int llog_create(struct llog_ctxt *ctxt, struct llog_handle **res, if (lop->lop_create == NULL) RETURN(-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 = lop->lop_create(ctxt, res, logid, name); - current->cap_effective = cap; + if (!raised) + cfs_cap_lower(CFS_CAP_SYS_RESOURCE); RETURN(rc); } -static inline int llog_connect(struct llog_ctxt *ctxt, int count, +static inline int llog_connect(struct llog_ctxt *ctxt, struct llog_logid *logid, struct llog_gen *gen, struct obd_uuid *uuid) { @@ -524,7 +671,7 @@ static inline int llog_connect(struct llog_ctxt *ctxt, int count, if (lop->lop_connect == NULL) RETURN(-EOPNOTSUPP); - rc = lop->lop_connect(ctxt, count, logid, gen, uuid); + rc = lop->lop_connect(ctxt, logid, gen, uuid); RETURN(rc); }