From ede08af7d30b2dc4c41b89db224ab1a3bdb2f30c Mon Sep 17 00:00:00 2001 From: Serguei Smirnov Date: Wed, 23 Dec 2020 17:43:21 -0800 Subject: [PATCH] LU-13641 socklnd: announce deprecation of 'use_tcp_bonding' Add warning to be printed if 'use_tcp_bonding' option is used notifying the user that the feature is being deprecated. It is suggested to use MR configuration with dynamic discovery instead. Multi-Rail feature doesn't need to be explicitly enabled. To use MR instead of tcp bonding, group the interfaces on the same network using the lnetctl utility: lnetctl net add --net tcp --if eth2,eth3 or via the modprobe configuration file (/etc/modprobe.d/lnet.conf or /etc/modprobe.d/lustre.conf): options lnet networks="tcp(eth2,eth3)" and make sure dynamic discovery is enabled: lnetctl set discovery 1 MR will aggregate the throughput of all configured and available networks/interfaces shared between peer nodes. Lustre-change: https://review.whamcloud.com/41088 Test-Parameters: trivial Signed-off-by: Serguei Smirnov Change-Id: I34288ae1c8a1c4092f88b45a571312691f145218 Reviewed-on: https://review.whamcloud.com/41102 Tested-by: jenkins Reviewed-by: Cyril Bordage Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- lnet/lnet/api-ni.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c index 04a14be..24e7d7a 100644 --- a/lnet/lnet/api-ni.c +++ b/lnet/lnet/api-ni.c @@ -71,7 +71,7 @@ MODULE_PARM_DESC(rnet_htable_size, "size of remote network hash table"); static int use_tcp_bonding = false; module_param(use_tcp_bonding, int, 0444); MODULE_PARM_DESC(use_tcp_bonding, - "Set to 1 to use socklnd bonding. 0 to use Multi-Rail"); + "use_tcp_bonding parameter has been deprecated"); unsigned int lnet_numa_range = 0; module_param(lnet_numa_range, uint, 0444); @@ -2590,6 +2590,9 @@ LNetNIInit(lnet_pid_t requested_pid) goto err_empty_list; } + if (use_tcp_bonding) + CWARN("'use_tcp_bonding' option has been deprecated. See LU-13641\n"); + /* If LNet is being initialized via DLC it is possible * that the user requests not to load module parameters (ones which * are supported by DLC) on initialization. Therefore, make sure not -- 1.8.3.1