X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fptlrpc%2Fllog_net.c;h=84d3ca68972c893e4869259fedb0e2c16f8232b6;hp=a1c54fcdb6e81fea2f6022141213cd0fe3d02d06;hb=e2af7fb3c91dfb13d34d8e1b2f2df8c09621f768;hpb=c9842fdc5244e38593f0b12468e87f23853dba9f diff --git a/lustre/ptlrpc/llog_net.c b/lustre/ptlrpc/llog_net.c index a1c54fc..84d3ca6 100644 --- a/lustre/ptlrpc/llog_net.c +++ b/lustre/ptlrpc/llog_net.c @@ -1,40 +1,49 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: +/* + * GPL HEADER START * - * Copyright (C) 2001-2003 Cluster File Systems, Inc. - * Author: Andreas Dilger + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This file is part of the Lustre file system, http://www.lustre.org - * Lustre is a trademark of Cluster File Systems, Inc. + * 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. * - * 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 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). * - * 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. + * 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 * - * 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. + * 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/ptlrpc/llog_net.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 -#ifndef EXPORT_SYMTAB -#define EXPORT_SYMTAB -#endif - #ifdef __KERNEL__ #include #else @@ -45,25 +54,29 @@ #include #include #include +#include #ifdef __KERNEL__ -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) { struct llog_gen_rec *lgr; struct ptlrpc_request *req; struct llogd_conn_body *req_body; - int rc; + struct inode* inode = ctxt->loc_handle->lgh_file->f_dentry->d_inode; + void *handle; + int rc, rc1; + ENTRY; - if (list_empty(&ctxt->loc_handle->u.chd.chd_head)) { + if (cfs_list_empty(&ctxt->loc_handle->u.chd.chd_head)) { CDEBUG(D_HA, "there is no record related to ctxt %p\n", ctxt); RETURN(0); } /* FIXME what value for gen->conn_cnt */ - LLOG_GEN_INC(ctxt->loc_gen); + llog_gen_init(ctxt); /* first add llog_gen_rec */ OBD_ALLOC_PTR(lgr); @@ -71,11 +84,24 @@ int llog_origin_connect(struct llog_ctxt *ctxt, int count, RETURN(-ENOMEM); lgr->lgr_hdr.lrh_len = lgr->lgr_tail.lrt_len = sizeof(*lgr); lgr->lgr_hdr.lrh_type = LLOG_GEN_REC; + + handle = fsfilt_start_log(ctxt->loc_exp->exp_obd, inode, + FSFILT_OP_CANCEL_UNLINK, NULL, 1); + if (IS_ERR(handle)) { + CERROR("fsfilt_start failed: %ld\n", PTR_ERR(handle)); + OBD_FREE(lgr, sizeof(*lgr)); + rc = PTR_ERR(handle); + RETURN(rc); + } + lgr->lgr_gen = ctxt->loc_gen; rc = llog_add(ctxt, &lgr->lgr_hdr, NULL, NULL, 1); OBD_FREE_PTR(lgr); - if (rc != 1) + rc1 = fsfilt_commit(ctxt->loc_exp->exp_obd, inode, handle, 0); + if (rc != 1 || rc1 != 0) { + rc = (rc != 1) ? rc : rc1; RETURN(rc); + } LASSERT(ctxt->loc_imp); req = ptlrpc_request_alloc_pack(ctxt->loc_imp, &RQF_LLOG_ORIGIN_CONNECT, @@ -84,12 +110,17 @@ int llog_origin_connect(struct llog_ctxt *ctxt, int count, if (req == NULL) RETURN(-ENOMEM); + CDEBUG(D_OTHER, "%s mount_count "LPU64", connection count "LPU64"\n", + ctxt->loc_exp->exp_obd->obd_type->typ_name, + ctxt->loc_gen.mnt_cnt, ctxt->loc_gen.conn_cnt); + req_body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_CONN_BODY); req_body->lgdc_gen = ctxt->loc_gen; req_body->lgdc_logid = ctxt->loc_handle->lgh_id; req_body->lgdc_ctxt_idx = ctxt->loc_idx + 1; ptlrpc_request_set_replen(req); + req->rq_no_resend = req->rq_no_delay = 1; rc = ptlrpc_queue_wait(req); ptlrpc_req_finished(req); @@ -108,7 +139,7 @@ int llog_handle_connect(struct ptlrpc_request *req) req_body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_CONN_BODY); ctxt = llog_get_context(obd, req_body->lgdc_ctxt_idx); - rc = llog_connect(ctxt, 1, &req_body->lgdc_logid, + rc = llog_connect(ctxt, &req_body->lgdc_logid, &req_body->lgdc_gen, NULL); llog_ctxt_put(ctxt); @@ -122,14 +153,32 @@ EXPORT_SYMBOL(llog_handle_connect); int llog_receptor_accept(struct llog_ctxt *ctxt, struct obd_import *imp) { ENTRY; + LASSERT(ctxt); - LASSERTF(ctxt->loc_imp == NULL || ctxt->loc_imp == imp, - "%p - %p\n", ctxt->loc_imp, imp); - ctxt->loc_imp = imp; + cfs_mutex_lock(&ctxt->loc_mutex); + if (ctxt->loc_imp != imp) { + if (ctxt->loc_imp) { + CWARN("changing the import %p - %p\n", + ctxt->loc_imp, imp); + class_import_put(ctxt->loc_imp); + } + ctxt->loc_imp = class_import_get(imp); + } + cfs_mutex_unlock(&ctxt->loc_mutex); RETURN(0); } EXPORT_SYMBOL(llog_receptor_accept); +#else /* !__KERNEL__ */ + +int llog_origin_connect(struct llog_ctxt *ctxt, + struct llog_logid *logid, struct llog_gen *gen, + struct obd_uuid *uuid) +{ + return 0; +} +#endif + int llog_initiator_connect(struct llog_ctxt *ctxt) { struct obd_import *new_imp; @@ -139,22 +188,13 @@ int llog_initiator_connect(struct llog_ctxt *ctxt) new_imp = ctxt->loc_obd->u.cli.cl_import; LASSERTF(ctxt->loc_imp == NULL || ctxt->loc_imp == new_imp, "%p - %p\n", ctxt->loc_imp, new_imp); - ctxt->loc_imp = new_imp; + cfs_mutex_lock(&ctxt->loc_mutex); + if (ctxt->loc_imp != new_imp) { + if (ctxt->loc_imp) + class_import_put(ctxt->loc_imp); + ctxt->loc_imp = class_import_get(new_imp); + } + cfs_mutex_unlock(&ctxt->loc_mutex); RETURN(0); } EXPORT_SYMBOL(llog_initiator_connect); - -#else /* !__KERNEL__ */ - -int llog_origin_connect(struct llog_ctxt *ctxt, int count, - struct llog_logid *logid, struct llog_gen *gen, - struct obd_uuid *uuid) -{ - return 0; -} - -int llog_initiator_connect(struct llog_ctxt *ctxt) -{ - return 0; -} -#endif