From: Andreas Dilger Date: Thu, 10 Nov 2016 19:11:47 +0000 (-0700) Subject: LU-8823 ptlrpc: remove obsolete OST/MDT thread parameters X-Git-Tag: 2.9.56~54 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=c472b2e6c6a6ccae0224edeb6fbc29bf01916129;p=fs%2Flustre-release.git LU-8823 ptlrpc: remove obsolete OST/MDT thread parameters The mdt_num_threads parameter was only briefly available from 2.0-2.2, while mds_num_threads has been available since 1.x to control the number of service threads on the MDS respectively. A warning message is printed on startup since 2.3 if mdt_num_threads parameters were in use, so there shouldn't be any users anymore. The ost_num_threads parameter has been deprecated since 1.6 or so. Signed-off-by: Andreas Dilger Change-Id: I587a1f3e4629d304412006a0f0e9fc1daeacab07 Reviewed-on: https://review.whamcloud.com/23705 Reviewed-by: Patrick Farrell Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Bob Glossman Reviewed-by: Oleg Drokin --- diff --git a/lustre/mdt/mdt_mds.c b/lustre/mdt/mdt_mds.c index 6201431..1105242 100644 --- a/lustre/mdt/mdt_mds.c +++ b/lustre/mdt/mdt_mds.c @@ -68,12 +68,8 @@ struct mds_device { }; /* - * * Initialized in mdt_mod_init(). + * * Initialized in mds_mod_init(). * */ -static unsigned long mdt_num_threads; -module_param(mdt_num_threads, ulong, 0444); -MODULE_PARM_DESC(mdt_num_threads, "number of MDS service threads to start (deprecated in favor of mds_num_threads)"); - static unsigned long mds_num_threads; module_param(mds_num_threads, ulong, 0444); MODULE_PARM_DESC(mds_num_threads, "number of MDS service threads to start"); @@ -84,20 +80,24 @@ MODULE_PARM_DESC(mds_num_cpts, "CPU partitions MDS threads should run on"); static unsigned long mds_rdpg_num_threads; module_param(mds_rdpg_num_threads, ulong, 0444); -MODULE_PARM_DESC(mds_rdpg_num_threads, "number of MDS readpage service threads to start"); +MODULE_PARM_DESC(mds_rdpg_num_threads, + "number of MDS readpage service threads to start"); static char *mds_rdpg_num_cpts; module_param(mds_rdpg_num_cpts, charp, 0444); -MODULE_PARM_DESC(mds_rdpg_num_cpts, "CPU partitions MDS readpage threads should run on"); +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; module_param(mds_attr_num_threads, ulong, 0444); -MODULE_PARM_DESC(mds_attr_num_threads, "number of MDS setattr service threads to start"); +MODULE_PARM_DESC(mds_attr_num_threads, + "number of MDS setattr service threads to start"); static char *mds_attr_num_cpts; module_param(mds_attr_num_cpts, charp, 0444); -MODULE_PARM_DESC(mds_attr_num_cpts, "CPU partitions MDS setattr threads should run on"); +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) @@ -571,13 +571,6 @@ static struct obd_ops mds_obd_device_ops = { 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); } diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c index d9cc62b..4592fe4 100644 --- a/lustre/ost/ost_handler.c +++ b/lustre/ost/ost_handler.c @@ -51,10 +51,6 @@ static int oss_num_threads; module_param(oss_num_threads, int, 0444); MODULE_PARM_DESC(oss_num_threads, "number of OSS service threads to start"); -static int ost_num_threads; -module_param(ost_num_threads, int, 0444); -MODULE_PARM_DESC(ost_num_threads, "number of OST service threads to start (deprecated)"); - static int oss_num_create_threads; module_param(oss_num_create_threads, int, 0444); MODULE_PARM_DESC(oss_num_create_threads, "number of OSS create threads to start"); @@ -418,13 +414,6 @@ static int __init ost_init(void) rc = class_register_type(&ost_obd_ops, NULL, true, NULL, LUSTRE_OSS_NAME, NULL); - if (ost_num_threads != 0 && oss_num_threads == 0) { - LCONSOLE_INFO("ost_num_threads module parameter is deprecated, " - "use oss_num_threads instead or unset both for " - "dynamic thread startup\n"); - oss_num_threads = ost_num_threads; - } - RETURN(rc); }