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

[fs/lustre-release.git] / lnet / lnet / router.c

diff --git a/lnet/lnet/router.c b/lnet/lnet/router.c
index ec92e1a..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)");
 
+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)");
@@ -404,7 +412,7 @@ lnet_add_route_to_rnet(struct lnet_remotenet *rnet, struct lnet_route *route)
         * different nodes are using the same list of routers, they end up
         * preferring different routers.
         */
-       offset = cfs_rand() % (len + 1);
+       offset = prandom_u32_max(len + 1);
        list_for_each(e, &rnet->lrn_routes) {
                if (offset == 0)
                        break;
@@ -544,6 +552,9 @@ lnet_add_route(__u32 net, __u32 hops, lnet_nid_t gateway,
        if (add_route) {
                gw->lp_health_sensitivity = sensitivity;
                lnet_add_route_to_rnet(rnet2, route);
+               if (lnet_peer_discovery_disabled)
+                       CWARN("Consider turning discovery on to enable full "
+                             "Multi-Rail routing functionality\n");
        }
 
        /*
@@ -1407,6 +1418,10 @@ lnet_rtrpools_enable(void)
                ~LNET_PING_FEAT_RTE_DISABLED;
        lnet_net_unlock(LNET_LOCK_EX);
 
+       if (lnet_peer_discovery_disabled)
+               CWARN("Consider turning discovery on to enable full "
+                     "Multi-Rail routing functionality\n");
+
        return rc;
 }