From patchwork Thu Feb 27 21:14:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Simmons X-Patchwork-Id: 11410481 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9009592A for ; Thu, 27 Feb 2020 21:39:32 +0000 (UTC) Received: from pdx1-mailman02.dreamhost.com (pdx1-mailman02.dreamhost.com [64.90.62.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 787BC24690 for ; Thu, 27 Feb 2020 21:39:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 787BC24690 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lustre-devel-bounces@lists.lustre.org Received: from pdx1-mailman02.dreamhost.com (localhost [IPv6:::1]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 9A43C34A5BB; Thu, 27 Feb 2020 13:32:12 -0800 (PST) X-Original-To: lustre-devel@lists.lustre.org Delivered-To: lustre-devel-lustre.org@pdx1-mailman02.dreamhost.com Received: from smtp3.ccs.ornl.gov (smtp3.ccs.ornl.gov [160.91.203.39]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 0ABC721FE5C for ; Thu, 27 Feb 2020 13:20:28 -0800 (PST) Received: from star.ccs.ornl.gov (star.ccs.ornl.gov [160.91.202.134]) by smtp3.ccs.ornl.gov (Postfix) with ESMTP id 33BD78F18; Thu, 27 Feb 2020 16:18:18 -0500 (EST) Received: by star.ccs.ornl.gov (Postfix, from userid 2004) id 32AAB46A; Thu, 27 Feb 2020 16:18:18 -0500 (EST) From: James Simmons To: Andreas Dilger , Oleg Drokin , NeilBrown Date: Thu, 27 Feb 2020 16:14:45 -0500 Message-Id: <1582838290-17243-418-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1582838290-17243-1-git-send-email-jsimmons@infradead.org> References: <1582838290-17243-1-git-send-email-jsimmons@infradead.org> Subject: [lustre-devel] [PATCH 417/622] lnet: Deprecate live and dead router check params X-BeenThere: lustre-devel@lists.lustre.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "For discussing Lustre software development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lustre Development List MIME-Version: 1.0 Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" From: Chris Horn Rather than delete these params let's deprecate them for one release and print a warning to console if the user is setting them. WC-bug-id: https://jira.whamcloud.com/browse/LU-12492 Lustre-commit: fca1a999899a ("LU-12492 lnet: Deprecate live and dead router check params") Signed-off-by: Chris Horn Reviewed-on: https://review.whamcloud.com/35387 Reviewed-by: Alexandr Boyko Reviewed-by: Amir Shehata Reviewed-by: Oleg Drokin Signed-off-by: James Simmons --- include/linux/lnet/lib-lnet.h | 2 ++ net/lnet/lnet/module.c | 4 ++++ net/lnet/lnet/router.c | 8 ++++++++ 3 files changed, 14 insertions(+) diff --git a/include/linux/lnet/lib-lnet.h b/include/linux/lnet/lib-lnet.h index 3dd56a2..dd0075b 100644 --- a/include/linux/lnet/lib-lnet.h +++ b/include/linux/lnet/lib-lnet.h @@ -501,6 +501,8 @@ struct lnet_ni * extern unsigned int lnet_drop_asym_route; extern unsigned int router_sensitivity_percentage; extern int alive_router_check_interval; +extern int live_router_check_interval; +extern int dead_router_check_interval; extern int portal_rotor; int lnet_lib_init(void); diff --git a/net/lnet/lnet/module.c b/net/lnet/lnet/module.c index 5905f38..939c255 100644 --- a/net/lnet/lnet/module.c +++ b/net/lnet/lnet/module.c @@ -245,6 +245,10 @@ static int __init lnet_init(void) return rc; } + if (live_router_check_interval != INT_MIN || + dead_router_check_interval != INT_MIN) + LCONSOLE_WARN("live_router_check_interval and dead_router_check_interval have been deprecated. Use alive_router_check_interval instead. Ignoring these deprecated parameters.\n"); + rc = blocking_notifier_chain_register(&libcfs_ioctl_list, &lnet_ioctl_handler); LASSERT(!rc); diff --git a/net/lnet/lnet/router.c b/net/lnet/lnet/router.c index eb76c72..892164b 100644 --- a/net/lnet/lnet/router.c +++ b/net/lnet/lnet/router.c @@ -78,6 +78,14 @@ module_param(avoid_asym_router_failure, int, 0644); MODULE_PARM_DESC(avoid_asym_router_failure, "Avoid asymmetrical router failures (0 to disable)"); +int dead_router_check_interval = INT_MIN; +module_param(dead_router_check_interval, int, 0444); +MODULE_PARM_DESC(dead_router_check_interval, "(DEPRECATED - Use alive_router_check_interval)"); + +int live_router_check_interval = INT_MIN; +module_param(live_router_check_interval, int, 0444); +MODULE_PARM_DESC(live_router_check_interval, "(DEPRECATED - Use alive_router_check_interval)"); + int alive_router_check_interval = 60; module_param(alive_router_check_interval, int, 0644); MODULE_PARM_DESC(alive_router_check_interval, "Seconds between live router health checks (<= 0 to disable)");