LU-12492 lnet: Deprecate live and dead router check params

Rather than delete these params let's deprecate them for one release
and print a warning to console if the user is setting them.

Test-Parameters: trivial
Signed-off-by: Chris Horn <hornc@cray.com>
Change-Id: I5796996dd00b06a59a872e7e8453ab64afd65dd0
Reviewed-on: https://review.whamcloud.com/35387
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Alexandr Boyko <c17825@cray.com>
Reviewed-by: Amir Shehata <ashehata@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lnet/include/lnet/lib-lnet.h b/lnet/include/lnet/lib-lnet.h
index 1606dba..3e7749e 100644 (file)
--- a/lnet/include/lnet/lib-lnet.h
+++ b/lnet/include/lnet/lib-lnet.h
@@ -566,6 +566,8 @@ extern unsigned int lnet_peer_discovery_disabled;
 extern unsigned int lnet_drop_asym_route;
 extern unsigned int router_sensitivity_percentage;
 extern int alive_router_check_interval;
 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;
 
 void lnet_mt_event_handler(struct lnet_event *event);
 extern int portal_rotor;
 
 void lnet_mt_event_handler(struct lnet_event *event);

diff --git a/lnet/lnet/module.c b/lnet/lnet/module.c
index 9b43c20..261c45c 100644 (file)
--- a/lnet/lnet/module.c
+++ b/lnet/lnet/module.c
@@ -241,6 +241,10 @@ static int __init lnet_init(void)
                RETURN(rc);
        }
 
                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 == 0);
        rc = blocking_notifier_chain_register(&libcfs_ioctl_list,
                                              &lnet_ioctl_handler);
        LASSERT(rc == 0);

diff --git a/lnet/lnet/router.c b/lnet/lnet/router.c
index d2c12eb..972c968 100644 (file)
--- a/lnet/lnet/router.c
+++ b/lnet/lnet/router.c
@@ -80,6 +80,14 @@ int avoid_asym_router_failure = 1;
 module_param(avoid_asym_router_failure, int, 0644);
 MODULE_PARM_DESC(avoid_asym_router_failure, "Avoid asymmetrical router failures (0 to disable)");
 
 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)");
 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)");