From 6aed5df1771c299b527251b0e18ff9f6cb95dd75 Mon Sep 17 00:00:00 2001 From: Gian-Carlo DeFazio Date: Thu, 8 Dec 2022 15:17:26 -0800 Subject: [PATCH] LU-14555 lnet: asym route inconsistency warning remove LNET_UNDEFINED_HOPS from lnet_check_route_inconsistency() where it is being treated as equivalent to 1 for the value of lr_hops. Due to the changes made in commit 3f2844dc9 "LU-14945 lnet: don't use hops to determine the route state", LNET_UNDEFINED_HOPS is no longer considered equivalent to 1 for lr_hops in all cases, and it is valid to leave hops undefined for multi-hop routes. Therefore, having a multi-hop route with a hops of LNET_UNDEFINED_HOPS is no longer inconsistent. Fixes: 6ab060e58e ("LU-14555 lnet: asym route inconsistency warning") Test-Parameters: trivial Signed-off-by: Gian-Carlo DeFazio Change-Id: Iab8597f59c5f8d27b16dbeda79b41e9ec4777f52 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49352 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Serguei Smirnov Reviewed-by: Chris Horn Reviewed-by: Oleg Drokin --- lnet/lnet/router.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lnet/lnet/router.c b/lnet/lnet/router.c index cff9496..8d4d5bd 100644 --- a/lnet/lnet/router.c +++ b/lnet/lnet/router.c @@ -382,8 +382,7 @@ lnet_consolidate_routes_locked(struct lnet_peer *orig_lp, static inline void lnet_check_route_inconsistency(struct lnet_route *route) { - if (!route->lr_single_hop && - (route->lr_hops == 1 || route->lr_hops == LNET_UNDEFINED_HOPS) && + if (!route->lr_single_hop && route->lr_hops == 1 && avoid_asym_router_failure) { CWARN("route %s->%s is detected to be multi-hop but hop count is set to %d\n", libcfs_net2str(route->lr_net), -- 1.8.3.1