From abf2ecad35e81f9c247da5c8214fa2fd7baf5439 Mon Sep 17 00:00:00 2001 From: Doug Oucharek Date: Tue, 16 May 2017 09:27:50 -0700 Subject: [PATCH] LU-9507 lnd: Don't Assert On Reconnect with MultiQP LU-8943 activated the ability to have multiple connections between peers. If any of those connections need to be reconnected (i.e. parameter renegotiation), we were getting an assert from kiblnd_reconnect_peer() which was not changed to allow for having multiple connections ongoing at the same time. This patch gets rid of the assert from kiblnd_reconnect_peer() which is no longer valid after LU-8943. Signed-off-by: Doug Oucharek Change-Id: I9cc7fae8836f2648603018fac38a88e3f90ec190 Reviewed-on: https://review.whamcloud.com/27139 Reviewed-by: Amir Shehata Tested-by: Jenkins Reviewed-by: James Simmons Reviewed-by: Dmitry Eremin Tested-by: Maloo Reviewed-by: Oleg Drokin --- lnet/klnds/o2iblnd/o2iblnd_cb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lnet/klnds/o2iblnd/o2iblnd_cb.c b/lnet/klnds/o2iblnd/o2iblnd_cb.c index 33bbb28..2ecccbf 100644 --- a/lnet/klnds/o2iblnd/o2iblnd_cb.c +++ b/lnet/klnds/o2iblnd/o2iblnd_cb.c @@ -1351,8 +1351,8 @@ kiblnd_reconnect_peer(kib_peer_ni_t *peer_ni) goto no_reconnect; } - LASSERT(!peer_ni->ibp_accepting && !peer_ni->ibp_connecting && - list_empty(&peer_ni->ibp_conns)); + if (peer_ni->ibp_accepting) + CNETERR("Detecting race between accepting and reconnecting\n"); peer_ni->ibp_reconnecting--; if (!kiblnd_peer_active(peer_ni)) { -- 1.8.3.1