From: Amir Shehata <ashehata@whamcloud.com>
Date: Mon, 29 Jul 2019 21:53:06 +0000 (-0700)
Subject: LU-12611 lnet: continue adding routes
X-Git-Tag: 2.12.58~54
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=4e0246c6dc15b5035a4bd875902eedaf42f63cdd;ds=sidebyside

LU-12611 lnet: continue adding routes

Continue adding routes specified even if the current route
exists or the gateway specified in the current route is unreachable.

Signed-off-by: Amir Shehata <ashehata@whamcloud.com>
Change-Id: I71257cd444c29d4641d9d27f05d9160871316b02
Reviewed-on: https://review.whamcloud.com/35641
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Chris Horn <hornc@cray.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Alexandr Boyko <c17825@cray.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lnet/utils/lnetconfig/liblnetconfig.c b/lnet/utils/lnetconfig/liblnetconfig.c
index e9d7463..23612c8 100644
--- a/lnet/utils/lnetconfig/liblnetconfig.c
+++ b/lnet/utils/lnetconfig/liblnetconfig.c
@@ -1080,7 +1080,7 @@ int lustre_lnet_config_route(char *nw, char *gw, int hops, int prio,
 		data.cfg_nid = gateway_nid;
 
 		rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_ADD_ROUTE, &data);
-		if (rc != 0) {
+		if (rc != 0 && errno != EEXIST && errno != EHOSTUNREACH) {
 			rc = -errno;
 			snprintf(err_str,
 				sizeof(err_str),