X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fmgs%2Fmgs_fs.c;h=217b41c2377b2e62cc8bff689ad7ceddd0a5becc;hb=73c2c103f4f43f9bb37119a2e90d6c0fc1870711;hp=3b57c671d87ad9cd6924fd12d84c971763c101e1;hpb=ef0b61b01f0fdbb500a6f03e84af0a074b613bb3;p=fs%2Flustre-release.git diff --git a/lustre/mgs/mgs_fs.c b/lustre/mgs/mgs_fs.c index 3b57c67..217b41c 100644 --- a/lustre/mgs/mgs_fs.c +++ b/lustre/mgs/mgs_fs.c @@ -15,11 +15,7 @@ * * 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. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,7 +23,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2012, Whamcloud, Inc. + * Copyright (c) 2011, 2015, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -43,59 +39,57 @@ #define DEBUG_SUBSYSTEM S_MGS -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include "mgs_internal.h" +/** + * Initialize MGS per-export statistics. + * + * This function sets up procfs entries for various MGS export counters. These + * counters are for per-client statistics tracked on the server. + * + * \param[in] obd OBD device + * \param[in] exp OBD export + * \param[in] localdata NID of client + * + * \retval 0 if successful + * \retval negative value on error + */ int mgs_export_stats_init(struct obd_device *obd, struct obd_export *exp, - void *localdata) - + void *localdata) { - lnet_nid_t *client_nid = localdata; - int rc, newnid; - ENTRY; - - rc = lprocfs_exp_setup(exp, client_nid, &newnid); - if (rc) { - /* Mask error for already created - * /proc entries */ - if (rc == -EALREADY) - rc = 0; - RETURN(rc); - } - if (newnid) { - struct nid_stat *tmp = exp->exp_nid_stats; - int num_stats = 0; - - num_stats = (sizeof(*obd->obd_type->typ_dt_ops) / sizeof(void *)) + - LPROC_MGS_LAST - 1; - tmp->nid_stats = lprocfs_alloc_stats(num_stats, - LPROCFS_STATS_FLAG_NOPERCPU); - if (tmp->nid_stats == NULL) - return -ENOMEM; - lprocfs_init_ops_stats(LPROC_MGS_LAST, tmp->nid_stats); - mgs_stats_counter_init(tmp->nid_stats); - rc = lprocfs_register_stats(tmp->nid_proc, "stats", - tmp->nid_stats); - if (rc) - GOTO(clean, rc); - - rc = lprocfs_nid_ldlm_stats_init(tmp); - if (rc) - GOTO(clean, rc); - } - RETURN(0); -clean: - return rc; + lnet_nid_t *client_nid = localdata; + struct nid_stat *stats; + int rc; + ENTRY; + + rc = lprocfs_exp_setup(exp, client_nid); + if (rc != 0) + /* Mask error for already created /proc entries */ + RETURN(rc == -EALREADY ? 0 : rc); + + stats = exp->exp_nid_stats; + stats->nid_stats = lprocfs_alloc_stats(NUM_OBD_STATS + LPROC_MGS_LAST, + LPROCFS_STATS_FLAG_NOPERCPU); + if (stats->nid_stats == NULL) + RETURN(-ENOMEM); + + lprocfs_init_ops_stats(LPROC_MGS_LAST, stats->nid_stats); + + mgs_stats_counter_init(stats->nid_stats); + + rc = lprocfs_register_stats(stats->nid_proc, "stats", stats->nid_stats); + if (rc != 0) { + lprocfs_free_stats(&stats->nid_stats); + GOTO(out, rc); + } + + rc = lprocfs_nid_ldlm_stats_init(stats); + if (rc != 0) + GOTO(out, rc); + +out: + RETURN(rc); } /** @@ -104,7 +98,7 @@ clean: * crash all connections are treated as new connections. */ int mgs_client_add(struct obd_device *obd, struct obd_export *exp, - void *localdata) + void *localdata) { return 0; } @@ -115,123 +109,138 @@ int mgs_client_free(struct obd_export *exp) return 0; } -/* Same as mds_lvfs_fid2dentry */ -/* Look up an entry by inode number. */ -/* this function ONLY returns valid dget'd dentries with an initialized inode - or errors */ -static struct dentry *mgs_lvfs_fid2dentry(__u64 id, __u32 gen, - __u64 gr, void *data) +int mgs_fs_setup(const struct lu_env *env, struct mgs_device *mgs) { - struct fsfilt_fid fid; - struct obd_device *obd = (struct obd_device *)data; - struct mgs_device *mgs = lu2mgs_dev(obd->obd_lu_dev); - ENTRY; - - CDEBUG(D_DENTRY, "--> mgs_fid2dentry: ino/gen %lu/%u, sb %p\n", - (unsigned long)id, gen, mgs->mgs_sb); - - if (id == 0) - RETURN(ERR_PTR(-ESTALE)); + struct lu_fid fid; + struct dt_object *o; + struct lu_fid rfid; + struct dt_object *root; + struct dt_object *nm_config_file_obj; + struct nm_config_file *nm_config_file; + int rc; + + ENTRY; + + OBD_SET_CTXT_MAGIC(&mgs->mgs_obd->obd_lvfs_ctxt); + mgs->mgs_obd->obd_lvfs_ctxt.dt = mgs->mgs_bottom; + + /* XXX: fix when support for N:1 layering is implemented */ + LASSERT(mgs->mgs_dt_dev.dd_lu_dev.ld_site); + mgs->mgs_dt_dev.dd_lu_dev.ld_site->ls_top_dev = + &mgs->mgs_dt_dev.dd_lu_dev; + + /* Setup the configs dir */ + fid.f_seq = FID_SEQ_LOCAL_NAME; + fid.f_oid = 1; + fid.f_ver = 0; + rc = local_oid_storage_init(env, mgs->mgs_bottom, &fid, &mgs->mgs_los); + if (rc) + GOTO(out, rc); + + rc = dt_root_get(env, mgs->mgs_bottom, &rfid); + if (rc) + GOTO(out_los, rc); + + root = dt_locate_at(env, mgs->mgs_bottom, &rfid, + &mgs->mgs_dt_dev.dd_lu_dev, NULL); + if (unlikely(IS_ERR(root))) + GOTO(out_los, rc = PTR_ERR(root)); + + o = local_file_find_or_create(env, mgs->mgs_los, root, + MOUNT_CONFIGS_DIR, + S_IFDIR | S_IRUGO | S_IWUSR | S_IXUGO); + if (IS_ERR(o)) + GOTO(out_root, rc = PTR_ERR(o)); + + if (!dt_try_as_dir(env, o)) { + dt_object_put(env, o); + GOTO(out_root, rc = -ENOTDIR); + } - fid.ino = id; - fid.gen = gen; + mgs->mgs_configs_dir = o; + + /* colocated MDT will cache config in target root dir */ + nm_config_file_obj = local_index_find_or_create(env, mgs->mgs_los, + mgs->mgs_configs_dir, + LUSTRE_NODEMAP_NAME, + S_IFREG | S_IRUGO | + S_IWUSR, + &dt_nodemap_features); + if (IS_ERR(nm_config_file_obj)) + GOTO(out_configs, rc = PTR_ERR(nm_config_file_obj)); + + if (nm_config_file_obj->do_index_ops == NULL) { + rc = nm_config_file_obj->do_ops->do_index_try(env, + nm_config_file_obj, + &dt_nodemap_features); + if (rc < 0) { + dt_object_put(env, nm_config_file_obj); + GOTO(out_configs, rc); + } + } + nm_config_file = nm_config_file_register_mgs(env, nm_config_file_obj, + mgs->mgs_los); + dt_object_put(env, nm_config_file_obj); + if (IS_ERR(nm_config_file)) { + CERROR("%s: error loading nodemap config file, file must be " + "removed via ldiskfs: rc = %ld\n", + mgs->mgs_obd->obd_name, PTR_ERR(nm_config_file)); + GOTO(out_configs, rc = PTR_ERR(nm_config_file)); + } + mgs->mgs_obd->u.obt.obt_nodemap_config_file = nm_config_file; - RETURN(fsfilt_fid2dentry(obd, mgs->mgs_vfsmnt, &fid, 0)); -} + /* create directory to store nid table versions */ + o = local_file_find_or_create(env, mgs->mgs_los, root, MGS_NIDTBL_DIR, + S_IFDIR | S_IRUGO | S_IWUSR | S_IXUGO); + if (IS_ERR(o)) + GOTO(out_nm, rc = PTR_ERR(o)); -struct lvfs_callback_ops mgs_lvfs_ops = { - l_fid2dentry: mgs_lvfs_fid2dentry, -}; + mgs->mgs_nidtbl_dir = o; -int mgs_fs_setup(const struct lu_env *env, struct mgs_device *mgs) -{ - struct obd_device *obd = mgs->mgs_obd; - struct dt_device_param p; - struct vfsmount *mnt; - struct lvfs_run_ctxt saved; - struct dentry *dentry; - int rc; - ENTRY; - - dt_conf_get(env, mgs->mgs_bottom, &p); - mnt = p.ddp_mnt; - if (mnt == NULL) { - CERROR("%s: no proper support for OSD yet\n", obd->obd_name); - RETURN(-ENODEV); +out_nm: + if (rc < 0) { + nm_config_file_deregister_mgs(env, nm_config_file); + mgs->mgs_obd->u.obt.obt_nodemap_config_file = NULL; } +out_configs: + if (rc < 0) { + dt_object_put(env, mgs->mgs_configs_dir); + mgs->mgs_configs_dir = NULL; + } +out_root: + dt_object_put(env, root); +out_los: + if (rc) { + local_oid_storage_fini(env, mgs->mgs_los); + mgs->mgs_los = NULL; + } +out: + mgs->mgs_dt_dev.dd_lu_dev.ld_site->ls_top_dev = NULL; - /* FIXME what's this? Do I need it? */ - rc = cfs_cleanup_group_info(); - if (rc) - RETURN(rc); - - mgs->mgs_vfsmnt = mnt; - mgs->mgs_sb = mnt->mnt_root->d_inode->i_sb; - - obd->obd_fsops = fsfilt_get_ops(mt_str(p.ddp_mount_type)); - if (IS_ERR(obd->obd_fsops)) - RETURN(PTR_ERR(obd->obd_fsops)); - - rc = fsfilt_setup(obd, mgs->mgs_sb); - if (rc) - RETURN(rc); - - OBD_SET_CTXT_MAGIC(&obd->obd_lvfs_ctxt); - obd->obd_lvfs_ctxt.pwdmnt = mnt; - obd->obd_lvfs_ctxt.pwd = mnt->mnt_root; - obd->obd_lvfs_ctxt.fs = get_ds(); - obd->obd_lvfs_ctxt.cb_ops = mgs_lvfs_ops; - - push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); - - /* Setup the configs dir */ - dentry = simple_mkdir(cfs_fs_pwd(current->fs), mnt, MOUNT_CONFIGS_DIR, 0777, 1); - if (IS_ERR(dentry)) { - rc = PTR_ERR(dentry); - CERROR("cannot create %s directory: rc = %d\n", - MOUNT_CONFIGS_DIR, rc); - GOTO(err_pop, rc); - } - mgs->mgs_configs_dir = dentry; - - /* create directory to store nid table versions */ - dentry = simple_mkdir(cfs_fs_pwd(current->fs), mnt, MGS_NIDTBL_DIR, - 0777, 1); - if (IS_ERR(dentry)) { - rc = PTR_ERR(dentry); - CERROR("cannot create %s directory: rc = %d\n", - MOUNT_CONFIGS_DIR, rc); - GOTO(err_pop, rc); - } else { - dput(dentry); - } - -err_pop: - pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); - return rc; + return rc; } int mgs_fs_cleanup(const struct lu_env *env, struct mgs_device *mgs) { - struct obd_device *obd = mgs->mgs_obd; - struct lvfs_run_ctxt saved; - int rc = 0; - - class_disconnect_exports(obd); /* cleans up client info too */ - - push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); - - if (mgs->mgs_configs_dir) { - l_dput(mgs->mgs_configs_dir); - mgs->mgs_configs_dir = NULL; - } - - shrink_dcache_sb(mgs->mgs_sb); + if (mgs->mgs_configs_dir) { + dt_object_put(env, mgs->mgs_configs_dir); + mgs->mgs_configs_dir = NULL; + } + if (mgs->mgs_nidtbl_dir) { + dt_object_put(env, mgs->mgs_nidtbl_dir); + mgs->mgs_nidtbl_dir = NULL; + } + if (mgs->mgs_obd->u.obt.obt_nodemap_config_file != NULL) { + struct nm_config_file *ncf = mgs->mgs_obd->u.obt.obt_nodemap_config_file; - pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); + nm_config_file_deregister_mgs(env, ncf); + mgs->mgs_obd->u.obt.obt_nodemap_config_file = NULL; + } - if (obd->obd_fsops) - fsfilt_put_ops(obd->obd_fsops); + if (mgs->mgs_los) { + local_oid_storage_fini(env, mgs->mgs_los); + mgs->mgs_los = NULL; + } - return rc; + return 0; }