From 58c4cd80e197bd6e70d1638df796ae878baf844c Mon Sep 17 00:00:00 2001 From: Liang Zhen Date: Mon, 27 Oct 2014 20:53:13 +0800 Subject: [PATCH] LU-5485 lnet: peer aliveness status and NI status A couple of changes to improve aliveness detection: - When LNet received a message, it can determine peer of this message is alive - When LNet recieved a message from remote network, it can determine router is alive and NI status on router is UP. Signed-off-by: Liang Zhen Change-Id: I4e0c65580a9cbaf4746f871bac02e6af7498de64 Reviewed-on: http://review.whamcloud.com/12435 Tested-by: Jenkins Reviewed-by: Isaac Huang Reviewed-by: James Simmons Reviewed-by: Amir Shehata Tested-by: Maloo Reviewed-by: Oleg Drokin --- lnet/include/lnet/lib-lnet.h | 9 +++++++++ lnet/lnet/lib-move.c | 13 +++++++++++++ lnet/lnet/router.c | 18 ++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/lnet/include/lnet/lib-lnet.h b/lnet/include/lnet/lib-lnet.h index 9cebc3a..d6b341e 100644 --- a/lnet/include/lnet/lib-lnet.h +++ b/lnet/include/lnet/lib-lnet.h @@ -945,6 +945,7 @@ int lnet_peer_buffer_credits(lnet_ni_t *ni); int lnet_router_checker_start(void); void lnet_router_checker_stop(void); +void lnet_router_ni_update_locked(lnet_peer_t *gw, __u32 net); void lnet_swap_pinginfo(lnet_ping_info_t *info); int lnet_ping_target_init(void); @@ -964,6 +965,14 @@ void lnet_peer_tables_destroy(void); int lnet_peer_tables_create(void); void lnet_debug_peer(lnet_nid_t nid); +static inline void +lnet_peer_set_alive(lnet_peer_t *lp) +{ + lp->lp_last_alive = lp->lp_last_query = cfs_time_current(); + if (!lp->lp_alive) + lnet_notify_locked(lp, 0, 1, lp->lp_last_alive); +} + #ifndef __KERNEL__ static inline int lnet_parse_int_tunable(int *value, char *name) diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c index 406e2ed..50eeccb 100644 --- a/lnet/lnet/lib-move.c +++ b/lnet/lnet/lib-move.c @@ -1957,6 +1957,19 @@ lnet_parse(lnet_ni_t *ni, lnet_hdr_t *hdr, lnet_nid_t from_nid, goto drop; } + if (lnet_isrouter(msg->msg_rxpeer)) { + lnet_peer_set_alive(msg->msg_rxpeer); + + if (LNET_NIDNET(src_nid) != LNET_NIDNET(from_nid)) { + /* received a remote message from router, update + * remote NI status on this router. + * NB: multi-hop routed message will be ignored. + */ + lnet_router_ni_update_locked(msg->msg_rxpeer, + LNET_NIDNET(src_nid)); + } + } + lnet_msg_commit(msg, cpt); if (!for_me) { diff --git a/lnet/lnet/router.c b/lnet/lnet/router.c index 53e1aff..ac06d49 100644 --- a/lnet/lnet/router.c +++ b/lnet/lnet/router.c @@ -787,6 +787,24 @@ lnet_wait_known_routerstate(void) } void +lnet_router_ni_update_locked(lnet_peer_t *gw, __u32 net) +{ + lnet_route_t *rte; + + if (!avoid_asym_router_failure) + return; + + if ((gw->lp_ping_feats & LNET_PING_FEAT_NI_STATUS) != 0) { + cfs_list_for_each_entry(rte, &gw->lp_routes, lr_gwlist) { + if (rte->lr_net == net) { + rte->lr_downis = 0; + break; + } + } + } +} + +void lnet_update_ni_status_locked(void) { lnet_ni_t *ni; -- 1.8.3.1