From: Chris Horn <chris.horn@hpe.com>
Date: Thu, 29 Apr 2021 18:14:34 +0000 (-0500)
Subject: LU-14654 lnet: Correct peer NI recovery age out calculation
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=e9fa930667bebcbefa1fb02d4a270df2954e6a2b;p=fs%2Flustre-release.git

LU-14654 lnet: Correct peer NI recovery age out calculation

The calculation to age a peer NI out of recovery is only valid if
lnet_recovery_limit is non-zero. When set to zero, we allow peer NIs
to be in recovery indefinitely.

Lustre-change: https://review.whamcloud.com/43501
Lustre-commit: 8f3f0e1219724d6e0ed727e46b28ab28203aef9f

Test-Parameters: trivial
HPE-bug-id: LUS-9953
Fixes: cc27201a76 ("LU-13569 lnet: Age peer NI out of recovery")
Signed-off-by: Chris Horn <chris.horn@hpe.com>
Change-Id: I6bb40ca3a9affa0eaaae9deb1cecdb03e4bb42c5
Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/54408
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Frank Sehr <fsehr@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
---

diff --git a/lnet/lnet/peer.c b/lnet/lnet/peer.c
index 35bc4b9..31349f9 100644
--- a/lnet/lnet/peer.c
+++ b/lnet/lnet/peer.c
@@ -4200,7 +4200,8 @@ lnet_peer_ni_add_to_recoveryq_locked(struct lnet_peer_ni *lpni,
 		return;
 	}
 
-	if (now > lpni->lpni_last_alive + lnet_recovery_limit) {
+	if (lnet_recovery_limit &&
+	    now > lpni->lpni_last_alive + lnet_recovery_limit) {
 		CDEBUG(D_NET, "lpni %s aged out last alive %lld\n",
 		       libcfs_nid2str(lpni->lpni_nid),
 		       lpni->lpni_last_alive);