LU-11762 ldlm: ensure the recovery timer is armed

[fs/lustre-release.git] / lustre / ldlm / ldlm_lib.c

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index 2688d07..6c311e2 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -2173,7 +2173,8 @@ repeat:
                /** evict exports which didn't finish recovery yet */
                class_disconnect_stale_exports(obd, exp_finished);
                return 1;
-       } else if (obd->obd_recovery_expired) {
+       } else if (obd->obd_recovery_expired &&
+                  obd->obd_recovery_timeout < obd->obd_recovery_time_hard) {
                obd->obd_recovery_expired = 0;
 
                /** If some clients died being recovered, evict them */