X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fllog.c;h=c2f4c1794d7ee05940f22f06f7cd4ce3c8b5e208;hb=e8ffe16619baf1ef7c5c6b117d338956372aa752;hp=0cc9e0e1b7db8e3d63b9d1a8e474892e7e97b21f;hpb=b61d3781d58689a994f4687d9396db17386926bd;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/llog.c b/lustre/obdclass/llog.c index 0cc9e0e..c2f4c17 100644 --- a/lustre/obdclass/llog.c +++ b/lustre/obdclass/llog.c @@ -1,32 +1,46 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (C) 2001-2003 Cluster File Systems, Inc. - * Author: Andreas Dilger + * 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 * - * OST<->MDS recovery logging infrastructure. + * 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 (c) 2003, 2010, Oracle and/or its affiliates. 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/obdclass/llog.c + * + * OST<->MDS recovery logging infrastructure. * Invariants in implementation: * - we do not share logs among different OST<->MDS connections, so that * if an OST or MDS fails it need only look at log(s) relevant to itself + * + * Author: Andreas Dilger */ #define DEBUG_SUBSYSTEM S_LOG @@ -54,7 +68,7 @@ struct llog_handle *llog_alloc_handle(void) if (loghandle == NULL) RETURN(ERR_PTR(-ENOMEM)); - init_rwsem(&loghandle->lgh_lock); + cfs_init_rwsem(&loghandle->lgh_lock); RETURN(loghandle); } @@ -69,9 +83,9 @@ void llog_free_handle(struct llog_handle *loghandle) if (!loghandle->lgh_hdr) goto out; if (loghandle->lgh_hdr->llh_flags & LLOG_F_IS_PLAIN) - list_del_init(&loghandle->u.phd.phd_entry); + cfs_list_del_init(&loghandle->u.phd.phd_entry); if (loghandle->lgh_hdr->llh_flags & LLOG_F_IS_CAT) - LASSERT(list_empty(&loghandle->u.chd.chd_head)); + LASSERT(cfs_list_empty(&loghandle->u.chd.chd_head)); OBD_FREE(loghandle->lgh_hdr, LLOG_CHUNK_SIZE); out: @@ -86,17 +100,17 @@ int llog_cancel_rec(struct llog_handle *loghandle, int index) int rc = 0; ENTRY; - CDEBUG(D_RPCTRACE, "canceling %d in log "LPX64"\n", + CDEBUG(D_RPCTRACE, "Canceling %d in log "LPX64"\n", index, loghandle->lgh_id.lgl_oid); if (index == 0) { - CERROR("cannot cancel index 0 (which is header)\n"); + CERROR("Can't cancel index 0 which is header\n"); RETURN(-EINVAL); } if (!ext2_clear_bit(index, llh->llh_bitmap)) { - CDEBUG(D_RPCTRACE, "catalog index %u already clear?\n", index); - RETURN(-EINVAL); + CDEBUG(D_RPCTRACE, "Catalog index %u already clear?\n", index); + RETURN(-ENOENT); } llh->llh_count--; @@ -106,7 +120,7 @@ int llog_cancel_rec(struct llog_handle *loghandle, int index) (loghandle->lgh_last_idx == (LLOG_BITMAP_BYTES * 8) - 1)) { rc = llog_destroy(loghandle); if (rc) { - CERROR("failure destroying log after last cancel: %d\n", + CERROR("Failure destroying log after last cancel: %d\n", rc); ext2_set_bit(index, llh->llh_bitmap); llh->llh_count++; @@ -118,7 +132,7 @@ int llog_cancel_rec(struct llog_handle *loghandle, int index) rc = llog_write_rec(loghandle, &llh->llh_hdr, NULL, 0, NULL, 0); if (rc) { - CERROR("failure re-writing header %d\n", rc); + CERROR("Failure re-writing header %d\n", rc); ext2_set_bit(index, llh->llh_bitmap); llh->llh_count++; } @@ -223,19 +237,20 @@ static int llog_process_thread(void *arg) if (!buf) { lpi->lpi_rc = -ENOMEM; #ifdef __KERNEL__ - complete(&lpi->lpi_completion); + cfs_complete(&lpi->lpi_completion); #endif return 0; } - cfs_daemonize("llog_process"); + if (!(lpi->lpi_flags & LLOG_FLAG_NODEAMON)) + cfs_daemonize_ctxt("llog_process_thread"); if (cd != NULL) { - last_called_index = cd->first_idx; - index = cd->first_idx + 1; + last_called_index = cd->lpcd_first_idx; + index = cd->lpcd_first_idx + 1; } - if (cd != NULL && cd->last_idx) - last_index = cd->last_idx; + if (cd != NULL && cd->lpcd_last_idx) + last_index = cd->lpcd_last_idx; else last_index = LLOG_BITMAP_BYTES * 8 - 1; @@ -305,13 +320,10 @@ static int llog_process_thread(void *arg) /* if set, process the callback on this record */ if (ext2_test_bit(index, llh->llh_bitmap)) { - rc = lpi->lpi_cb(loghandle, rec, lpi->lpi_cbdata); + rc = lpi->lpi_cb(loghandle, rec, + lpi->lpi_cbdata); last_called_index = index; if (rc == LLOG_PROC_BREAK) { - CDEBUG(D_HA, "recovery from log: "LPX64 - ":%x stopped\n", - loghandle->lgh_id.lgl_oid, - loghandle->lgh_id.lgl_ogen); GOTO(out, rc); } else if (rc == LLOG_DEL_RECORD) { llog_cancel_rec(loghandle, @@ -333,18 +345,18 @@ static int llog_process_thread(void *arg) out: if (cd != NULL) - cd->last_idx = last_called_index; + cd->lpcd_last_idx = last_called_index; if (buf) OBD_FREE(buf, LLOG_CHUNK_SIZE); lpi->lpi_rc = rc; #ifdef __KERNEL__ - complete(&lpi->lpi_completion); + cfs_complete(&lpi->lpi_completion); #endif return 0; } -int llog_process(struct llog_handle *loghandle, llog_cb_t cb, - void *data, void *catdata) +int llog_process_flags(struct llog_handle *loghandle, llog_cb_t cb, + void *data, void *catdata, int flags) { struct llog_process_info *lpi; int rc; @@ -359,16 +371,17 @@ int llog_process(struct llog_handle *loghandle, llog_cb_t cb, lpi->lpi_cb = cb; lpi->lpi_cbdata = data; lpi->lpi_catdata = catdata; + lpi->lpi_flags = flags; #ifdef __KERNEL__ - init_completion(&lpi->lpi_completion); - rc = cfs_kernel_thread(llog_process_thread, lpi, CLONE_VM | CLONE_FILES); + cfs_init_completion(&lpi->lpi_completion); + rc = cfs_create_thread(llog_process_thread, lpi, CFS_DAEMON_FLAGS); if (rc < 0) { CERROR("cannot start thread: %d\n", rc); OBD_FREE_PTR(lpi); RETURN(rc); } - wait_for_completion(&lpi->lpi_completion); + cfs_wait_for_completion(&lpi->lpi_completion); #else llog_process_thread(lpi); #endif @@ -376,6 +389,13 @@ int llog_process(struct llog_handle *loghandle, llog_cb_t cb, OBD_FREE_PTR(lpi); RETURN(rc); } +EXPORT_SYMBOL(llog_process_flags); + +int llog_process(struct llog_handle *loghandle, llog_cb_t cb, + void *data, void *catdata) +{ + return llog_process_flags(loghandle, cb, data, catdata, 0); +} EXPORT_SYMBOL(llog_process); inline int llog_get_size(struct llog_handle *loghandle) @@ -400,9 +420,9 @@ int llog_reverse_process(struct llog_handle *loghandle, llog_cb_t cb, RETURN(-ENOMEM); if (cd != NULL) - first_index = cd->first_idx + 1; - if (cd != NULL && cd->last_idx) - index = cd->last_idx; + first_index = cd->lpcd_first_idx + 1; + if (cd != NULL && cd->lpcd_last_idx) + index = cd->lpcd_last_idx; else index = LLOG_BITMAP_BYTES * 8 - 1; @@ -447,10 +467,6 @@ int llog_reverse_process(struct llog_handle *loghandle, llog_cb_t cb, if (ext2_test_bit(index, llh->llh_bitmap)) { rc = cb(loghandle, rec, data); if (rc == LLOG_PROC_BREAK) { - CWARN("recovery from log: "LPX64":%x" - " stopped\n", - loghandle->lgh_id.lgl_oid, - loghandle->lgh_id.lgl_ogen); GOTO(out, rc); } if (rc)