From: Serguei Smirnov Date: Thu, 4 Nov 2021 18:35:43 +0000 (-0700) Subject: LU-15137 socklnd: expect two control connections maximum X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=bd5719972b1f44f9db8a6f26a55225145e05288c;hp=2d4ba09e46fd2f49807664c5146e3364af549c82;p=fs%2Flustre-release.git LU-15137 socklnd: expect two control connections maximum As a result of connecting to ourselves, e.g. pinging own nid, two control type connections are established vs. just one in case of connecting externally. Fix the control connection counter to be able to handle that. Lustre-change: https://review.whamcloud.com/45461 Lustre-commit: ee9a03d8308c5918a17e2e45fd59ee5a4c38acaf Test-Parameters: trivial testlist=sanity-lnet Fixes: e8842e86 ("LU-12815 socklnd: add conns_per_peer parameter") Signed-off-by: Serguei Smirnov Change-Id: Idce01d81e3924226b5b163d2472cbcd4f6eb5819 Reviewed-by: Andreas Dilger Reviewed-by: Amir Shehata Reviewed-on: https://review.whamcloud.com/46034 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Cyril Bordage --- diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h index 80d9952..d7b4edb 100644 --- a/lnet/klnds/socklnd/socklnd.h +++ b/lnet/klnds/socklnd/socklnd.h @@ -392,7 +392,7 @@ struct ksock_route { unsigned int ksnr_connecting:1;/* connection establishment in progress */ unsigned int ksnr_connected:4; /* connections established by type */ unsigned int ksnr_deleted:1; /* been removed from peer_ni? */ - unsigned int ksnr_ctrl_conn_count:1; /* # conns by type */ + unsigned int ksnr_ctrl_conn_count:2; /* # conns by type */ unsigned int ksnr_blki_conn_count:8; unsigned int ksnr_blko_conn_count:8; unsigned int ksnr_share_count; /* created explicitly? */