LU-14536 obi2lnd: don't try to reconnect if there's no listener

[fs/lustre-release.git] / lnet / klnds / o2iblnd / o2iblnd_cb.c

diff --git a/lnet/klnds/o2iblnd/o2iblnd_cb.c b/lnet/klnds/o2iblnd/o2iblnd_cb.c
index de5e782..1c5dda3 100644 (file)
--- 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);