From 51cef6191ae8722adb1045f66b5de4504dab83d4 Mon Sep 17 00:00:00 2001 From: Lai Siyao Date: Mon, 5 Dec 2011 15:28:39 +0800 Subject: [PATCH] LU-630 lnet: only router checks peer health The peer health code is designed for router, so a ~rtr node always assumes peers to be alive. Signed-off-by: Lai Siyao Change-Id: Iacdc7359c69e0f172de0914048b35bd6fe06133e Reviewed-on: http://review.whamcloud.com/1797 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Liang Zhen Reviewed-by: Oleg Drokin --- lnet/lnet/lib-move.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c index fb726e3..b93c8ee 100644 --- a/lnet/lnet/lib-move.c +++ b/lnet/lnet/lib-move.c @@ -923,6 +923,7 @@ lnet_ni_peer_alive(lnet_peer_t *lp) LASSERT (lnet_peer_aliveness_enabled(lp)); LASSERT (ni->ni_lnd->lnd_query != NULL); + LASSERT (the_lnet.ln_routing == 1); LNET_UNLOCK(); (ni->ni_lnd->lnd_query)(ni, lp->lp_nid, &last_alive); @@ -932,7 +933,6 @@ lnet_ni_peer_alive(lnet_peer_t *lp) if (last_alive != 0) /* NI has updated timestamp */ lp->lp_last_alive = last_alive; - return; } /* NB: always called with LNET_LOCK held */ @@ -943,6 +943,7 @@ lnet_peer_is_alive (lnet_peer_t *lp, cfs_time_t now) cfs_time_t deadline; LASSERT (lnet_peer_aliveness_enabled(lp)); + LASSERT (the_lnet.ln_routing == 1); /* Trust lnet_notify() if it has more recent aliveness news, but * ignore the initial assumed death (see lnet_peers_start_down()). @@ -974,6 +975,10 @@ lnet_peer_alive_locked (lnet_peer_t *lp) { cfs_time_t now = cfs_time_current(); + /* LU-630: only router checks peer health. */ + if (the_lnet.ln_routing == 0) + return 1; + if (!lnet_peer_aliveness_enabled(lp)) return -ENODEV; -- 1.8.3.1