X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_mds.c;h=eee7e162d135a18bec2d60e7137e36c27cffc9f9;hb=cc6ef11d2f972ebc440013bddda87a536a09750c;hp=cb28d88d3f5395a654b04d668df179262a5601d5;hpb=736ffdc4d6975aaeac83019dd2a88100f4e3d028;p=fs%2Flustre-release.git diff --git a/lustre/mdt/mdt_mds.c b/lustre/mdt/mdt_mds.c index cb28d88..eee7e16 100644 --- a/lustre/mdt/mdt_mds.c +++ b/lustre/mdt/mdt_mds.c @@ -23,7 +23,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2013, Intel Corporation. + * Copyright (c) 2013, 2015, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -52,57 +52,60 @@ #include "mdt_internal.h" #include #include -#include +#include struct mds_device { /* super-class */ - struct md_device mds_md_dev; - struct ptlrpc_service *mds_regular_service; - struct ptlrpc_service *mds_readpage_service; - struct ptlrpc_service *mds_out_service; - struct ptlrpc_service *mds_setattr_service; - struct ptlrpc_service *mds_mdsc_service; - struct ptlrpc_service *mds_mdss_service; - struct ptlrpc_service *mds_fld_service; + struct md_device mds_md_dev; + struct ptlrpc_service *mds_regular_service; + struct ptlrpc_service *mds_readpage_service; + struct ptlrpc_service *mds_out_service; + struct ptlrpc_service *mds_setattr_service; + struct ptlrpc_service *mds_mdsc_service; + struct ptlrpc_service *mds_mdss_service; + struct ptlrpc_service *mds_fld_service; + struct mutex mds_health_mutex; + struct kset *mds_kset; }; /* - * * Initialized in mdt_mod_init(). + * * Initialized in mds_mod_init(). * */ -static unsigned long mdt_num_threads; -CFS_MODULE_PARM(mdt_num_threads, "ul", ulong, 0444, - "number of MDS service threads to start " - "(deprecated in favor of mds_num_threads)"); - static unsigned long mds_num_threads; -CFS_MODULE_PARM(mds_num_threads, "ul", ulong, 0444, - "number of MDS service threads to start"); +module_param(mds_num_threads, ulong, 0444); +MODULE_PARM_DESC(mds_num_threads, "number of MDS service threads to start"); static char *mds_num_cpts; -CFS_MODULE_PARM(mds_num_cpts, "c", charp, 0444, - "CPU partitions MDS threads should run on"); +module_param(mds_num_cpts, charp, 0444); +MODULE_PARM_DESC(mds_num_cpts, "CPU partitions MDS threads should run on"); static unsigned long mds_rdpg_num_threads; -CFS_MODULE_PARM(mds_rdpg_num_threads, "ul", ulong, 0444, - "number of MDS readpage service threads to start"); +module_param(mds_rdpg_num_threads, ulong, 0444); +MODULE_PARM_DESC(mds_rdpg_num_threads, + "number of MDS readpage service threads to start"); static char *mds_rdpg_num_cpts; -CFS_MODULE_PARM(mds_rdpg_num_cpts, "c", charp, 0444, - "CPU partitions MDS readpage threads should run on"); +module_param(mds_rdpg_num_cpts, charp, 0444); +MODULE_PARM_DESC(mds_rdpg_num_cpts, + "CPU partitions MDS readpage threads should run on"); /* NB: these two should be removed along with setattr service in the future */ static unsigned long mds_attr_num_threads; -CFS_MODULE_PARM(mds_attr_num_threads, "ul", ulong, 0444, - "number of MDS setattr service threads to start"); +module_param(mds_attr_num_threads, ulong, 0444); +MODULE_PARM_DESC(mds_attr_num_threads, + "number of MDS setattr service threads to start"); static char *mds_attr_num_cpts; -CFS_MODULE_PARM(mds_attr_num_cpts, "c", charp, 0444, - "CPU partitions MDS setattr threads should run on"); +module_param(mds_attr_num_cpts, charp, 0444); +MODULE_PARM_DESC(mds_attr_num_cpts, + "CPU partitions MDS setattr threads should run on"); /* device init/fini methods */ static void mds_stop_ptlrpc_service(struct mds_device *m) { ENTRY; + + mutex_lock(&m->mds_health_mutex); if (m->mds_regular_service != NULL) { ptlrpc_unregister_service(m->mds_regular_service); m->mds_regular_service = NULL; @@ -131,6 +134,8 @@ static void mds_stop_ptlrpc_service(struct mds_device *m) ptlrpc_unregister_service(m->mds_fld_service); m->mds_fld_service = NULL; } + mutex_unlock(&m->mds_health_mutex); + EXIT; } @@ -179,7 +184,8 @@ static int mds_start_ptlrpc_service(struct mds_device *m) .so_hpreq_handler = ptlrpc_hpreq_handler, }, }; - m->mds_regular_service = ptlrpc_register_service(&conf, procfs_entry); + m->mds_regular_service = ptlrpc_register_service(&conf, m->mds_kset, + procfs_entry); if (IS_ERR(m->mds_regular_service)) { rc = PTR_ERR(m->mds_regular_service); CERROR("failed to start regular mdt service: %d\n", rc); @@ -222,7 +228,8 @@ static int mds_start_ptlrpc_service(struct mds_device *m) .so_req_printer = target_print_req, }, }; - m->mds_readpage_service = ptlrpc_register_service(&conf, procfs_entry); + m->mds_readpage_service = ptlrpc_register_service(&conf, m->mds_kset, + procfs_entry); if (IS_ERR(m->mds_readpage_service)) { rc = PTR_ERR(m->mds_readpage_service); CERROR("failed to start readpage service: %d\n", rc); @@ -269,7 +276,8 @@ static int mds_start_ptlrpc_service(struct mds_device *m) .so_hpreq_handler = NULL, }, }; - m->mds_setattr_service = ptlrpc_register_service(&conf, procfs_entry); + m->mds_setattr_service = ptlrpc_register_service(&conf, m->mds_kset, + procfs_entry); if (IS_ERR(m->mds_setattr_service)) { rc = PTR_ERR(m->mds_setattr_service); CERROR("failed to start setattr service: %d\n", rc); @@ -314,7 +322,8 @@ static int mds_start_ptlrpc_service(struct mds_device *m) .so_hpreq_handler = NULL, }, }; - m->mds_out_service = ptlrpc_register_service(&conf, procfs_entry); + m->mds_out_service = ptlrpc_register_service(&conf, m->mds_kset, + procfs_entry); if (IS_ERR(m->mds_out_service)) { rc = PTR_ERR(m->mds_out_service); CERROR("failed to start out service: %d\n", rc); @@ -349,7 +358,8 @@ static int mds_start_ptlrpc_service(struct mds_device *m) .so_hpreq_handler = NULL, }, }; - m->mds_mdsc_service = ptlrpc_register_service(&conf, procfs_entry); + m->mds_mdsc_service = ptlrpc_register_service(&conf, m->mds_kset, + procfs_entry); if (IS_ERR(m->mds_mdsc_service)) { rc = PTR_ERR(m->mds_mdsc_service); CERROR("failed to start seq controller service: %d\n", rc); @@ -385,7 +395,8 @@ static int mds_start_ptlrpc_service(struct mds_device *m) .so_hpreq_handler = NULL, }, }; - m->mds_mdss_service = ptlrpc_register_service(&conf, procfs_entry); + m->mds_mdss_service = ptlrpc_register_service(&conf, m->mds_kset, + procfs_entry); if (IS_ERR(m->mds_mdss_service)) { rc = PTR_ERR(m->mds_mdss_service); CERROR("failed to start metadata seq server service: %d\n", rc); @@ -419,7 +430,8 @@ static int mds_start_ptlrpc_service(struct mds_device *m) .so_hpreq_handler = NULL, }, }; - m->mds_fld_service = ptlrpc_register_service(&conf, procfs_entry); + m->mds_fld_service = ptlrpc_register_service(&conf, m->mds_kset, + procfs_entry); if (IS_ERR(m->mds_fld_service)) { rc = PTR_ERR(m->mds_fld_service); CERROR("failed to start fld service: %d\n", rc); @@ -449,7 +461,7 @@ static struct lu_device *mds_device_fini(const struct lu_env *env, ENTRY; mds_stop_ptlrpc_service(m); - lprocfs_obd_cleanup(obd); + lprocfs_kset_unregister(obd, m->mds_kset); RETURN(NULL); } @@ -464,13 +476,6 @@ static struct lu_device *mds_device_free(const struct lu_env *env, RETURN(NULL); } -LPROC_SEQ_FOPS_RO_TYPE(mds, uuid); - -static struct lprocfs_seq_vars lprocfs_mds_obd_vars[] = { - { "uuid", &mds_uuid_fops }, - { 0 } -}; - static struct lu_device *mds_device_alloc(const struct lu_env *env, struct lu_device_type *t, struct lustre_cfg *cfg) @@ -494,17 +499,18 @@ static struct lu_device *mds_device_alloc(const struct lu_env *env, /* set this lu_device to obd, because error handling need it */ obd->obd_lu_dev = l; - obd->obd_vars = lprocfs_mds_obd_vars; - rc = lprocfs_obd_setup(obd); + rc = lprocfs_kset_register(obd, &m->mds_kset); if (rc != 0) { mds_device_free(env, l); l = ERR_PTR(rc); return l; } - rc = mds_start_ptlrpc_service(m); + mutex_init(&m->mds_health_mutex); + rc = mds_start_ptlrpc_service(m); if (rc != 0) { + lprocfs_kset_unregister(obd, m->mds_kset); mds_device_free(env, l); l = ERR_PTR(rc); return l; @@ -534,19 +540,32 @@ static struct lu_device_type mds_device_type = { .ldt_ctx_tags = LCT_MD_THREAD }; +static int mds_health_check(const struct lu_env *env, struct obd_device *obd) +{ + struct mds_device *mds = mds_dev(obd->obd_lu_dev); + int rc = 0; + + + mutex_lock(&mds->mds_health_mutex); + rc |= ptlrpc_service_health_check(mds->mds_regular_service); + rc |= ptlrpc_service_health_check(mds->mds_readpage_service); + rc |= ptlrpc_service_health_check(mds->mds_out_service); + rc |= ptlrpc_service_health_check(mds->mds_setattr_service); + rc |= ptlrpc_service_health_check(mds->mds_mdsc_service); + rc |= ptlrpc_service_health_check(mds->mds_mdss_service); + rc |= ptlrpc_service_health_check(mds->mds_fld_service); + mutex_unlock(&mds->mds_health_mutex); + + return rc != 0 ? 1 : 0; +} + static struct obd_ops mds_obd_device_ops = { .o_owner = THIS_MODULE, + .o_health_check = mds_health_check, }; int mds_mod_init(void) { - if (mdt_num_threads != 0 && mds_num_threads == 0) { - LCONSOLE_INFO("mdt_num_threads module parameter is deprecated, " - "use mds_num_threads instead or unset both for " - "dynamic thread startup\n"); - mds_num_threads = mdt_num_threads; - } - return class_register_type(&mds_obd_device_ops, NULL, true, NULL, LUSTRE_MDS_NAME, &mds_device_type); }