From 67ba3ce23d32266eabd5f8c56fa78d65920455e8 Mon Sep 17 00:00:00 2001 From: Li Dongyang Date: Fri, 19 Mar 2021 21:21:58 +1100 Subject: [PATCH] LU-14536 obi2lnd: don't try to reconnect if there's no listener For each discovery we try to reconnect up to retry_count times, default to 5. during MDT mount process conf log, there will be multiple discovery made for each OST. If the OSTs are not up, the mount will have a long time out. Change-Id: If1d854216d2f26089c52d3fb501092b7f48a444d Test-Parameters: trivial Signed-off-by: Li Dongyang Reviewed-on: https://review.whamcloud.com/42111 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Serguei Smirnov Reviewed-by: Amir Shehata Reviewed-by: Oleg Drokin --- lnet/klnds/o2iblnd/o2iblnd.h | 2 -- lnet/klnds/o2iblnd/o2iblnd_cb.c | 15 --------------- 2 files changed, 17 deletions(-) diff --git a/lnet/klnds/o2iblnd/o2iblnd.h b/lnet/klnds/o2iblnd/o2iblnd.h index a69c3d0..83c0d73 100644 --- a/lnet/klnds/o2iblnd/o2iblnd.h +++ b/lnet/klnds/o2iblnd/o2iblnd.h @@ -670,8 +670,6 @@ struct kib_peer_ni { unsigned char ibp_races; /* # consecutive reconnection attempts to this peer */ unsigned int ibp_reconnected; - /* number of total active retries */ - unsigned int ibp_retries; /* errno on closing this peer_ni */ int ibp_error; /* max map_on_demand */ diff --git a/lnet/klnds/o2iblnd/o2iblnd_cb.c b/lnet/klnds/o2iblnd/o2iblnd_cb.c index de5e782..1c5dda3 100644 --- a/lnet/klnds/o2iblnd/o2iblnd_cb.c +++ b/lnet/klnds/o2iblnd/o2iblnd_cb.c @@ -2305,9 +2305,6 @@ kiblnd_connreq_done(struct kib_conn *conn, int status) /* connection established */ write_lock_irqsave(&kiblnd_data.kib_global_lock, flags); - /* reset retry count */ - peer_ni->ibp_retries = 0; - conn->ibc_last_send = ktime_get(); kiblnd_set_conn_state(conn, IBLND_CONN_ESTABLISHED); kiblnd_peer_alive(peer_ni); @@ -2753,11 +2750,6 @@ kiblnd_check_reconnect(struct kib_conn *conn, int version, goto out; } - if (peer_ni->ibp_retries > *kiblnd_tunables.kib_retry_count) { - reason = "retry count exceeded due to no listener"; - goto out; - } - switch (why) { default: reason = "Unknown"; @@ -2815,10 +2807,6 @@ kiblnd_check_reconnect(struct kib_conn *conn, int version, case IBLND_REJECT_CONN_UNCOMPAT: reason = "version negotiation"; break; - - case IBLND_REJECT_INVALID_SRV_ID: - reason = "invalid service id"; - break; } conn->ibc_reconnect = 1; @@ -2858,9 +2846,6 @@ kiblnd_rejected(struct kib_conn *conn, int reason, void *priv, int priv_nob) case IB_CM_REJ_INVALID_SERVICE_ID: status = -EHOSTUNREACH; - peer_ni->ibp_retries++; - kiblnd_check_reconnect(conn, IBLND_MSG_VERSION, 0, - IBLND_REJECT_INVALID_SRV_ID, NULL); CNETERR("%s rejected: no listener at %d\n", libcfs_nid2str(peer_ni->ibp_nid), *kiblnd_tunables.kib_service); -- 1.8.3.1