LU-13569 lnet: Deprecate lnet_recovery_interval

[fs/lustre-release.git] / lnet / lnet / lib-move.c

diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c
index c9b14f5..9420d6a 100644 (file)
--- a/lnet/lnet/lib-move.c
+++ b/lnet/lnet/lib-move.c
@@ -3735,9 +3735,7 @@ lnet_recover_peer_nis(void)
 static int
 lnet_monitor_thread(void *arg)
 {
-       time64_t recovery_timeout = 0;
        time64_t rsp_timeout = 0;
-       int interval;
        time64_t now;
 
        wait_for_completion(&the_lnet.ln_started);
@@ -3764,11 +3762,8 @@ lnet_monitor_thread(void *arg)
                        rsp_timeout = now + (lnet_transaction_timeout / 2);
                }
 
-               if (now >= recovery_timeout) {
-                       lnet_recover_local_nis();
-                       lnet_recover_peer_nis();
-                       recovery_timeout = now + lnet_recovery_interval;
-               }
+               lnet_recover_local_nis();
+               lnet_recover_peer_nis();
 
                /*
                 * TODO do we need to check if we should sleep without
@@ -3778,18 +3773,10 @@ lnet_monitor_thread(void *arg)
                 * if we wake up every 1 second? Although, we've seen
                 * cases where we get a complaint that an idle thread
                 * is waking up unnecessarily.
-                *
-                * Take into account the current net_count when you wake
-                * up for alive router checking, since we need to check
-                * possibly as many networks as we have configured.
                 */
-               interval = min(lnet_recovery_interval,
-                              min((unsigned int) alive_router_check_interval /
-                                       lnet_current_net_count,
-                                  lnet_transaction_timeout / 2));
                wait_for_completion_interruptible_timeout(
                        &the_lnet.ln_mt_wait_complete,
-                       cfs_time_seconds(interval));
+                       cfs_time_seconds(1));
                /* Must re-init the completion before testing anything,
                 * including ln_mt_state.
                 */