RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-17 19:16:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: bind-conf: support a new shards value: "by-group"

Browse Source 
Setting "shards by-group" will create one shard per thread group. This
can often be a reasonable tradeoff between a single one that can be
suboptimal on CPUs with many cores, and too many that will eat a lot
of file descriptors. It was shown to provide good results on a 224
thread machine, with a distribution that was even smoother than the
system's since here it can take into account the number of connections
per thread in the group. Depending on how popular it becomes, it could
even become the default setting in a future version.
This commit is contained in:
Willy Tarreau 2023-04-13 17:25:43 +02:00
parent d30e82b9f0
commit a07635ead5
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/configuration.txt
View File

@ -15141,7 +15141,7 @@ quic-force-retry
See https://www.rfc-editor.org/rfc/rfc9000.html#section-8.1.2 for more
information about QUIC retry.
shards <number> | by-thread
shards <number> | by-thread | by-group
In multi-threaded mode, on operating systems supporting multiple listeners on
the same IP:port, this will automatically create this number of multiple
identical listeners for the same line, all bound to a fair share of the number
@ -15157,7 +15157,11 @@ shards <number> | by-thread
thread). The special "by-thread" value also creates as many shards as there
are threads on the "bind" line. Since the system will evenly distribute the
incoming traffic between all these shards, it is important that this number
is an integral divisor of the number of threads.
is an integral divisor of the number of threads. Alternately, the other
special value "by-group" will create one shard per thread group. This can
be useful when dealing with many threads and not wanting to create too many
sockets. The load distribution will be a bit less optimal but the contention
(especially in the system) will still be lower than with a single socket.
ssl
This setting is only available when support for OpenSSL was built in. It

4
src/cfgparse.c
View File

@ -2972,9 +2972,11 @@ init_proxies_list_stage1:
shards = bind_conf->settings.shards;
todo = thread_set_count(&bind_conf->thread_set);
/* special values: -1 = "by-thread" */
/* special values: -1 = "by-thread", -2 = "by-group" */
if (shards == -1)
shards = todo;
else if (shards == -2)
shards = my_popcountl(bind_conf->thread_set.grps);
/* no more shards than total threads */
if (shards > todo)

4
src/listener.c
View File

@ -1854,7 +1854,7 @@ static int bind_parse_proto(char **args, int cur_arg, struct proxy *px, struct b
return 0;
}
/* parse the "shards" bind keyword. Takes an integer or "by-thread" */
/* parse the "shards" bind keyword. Takes an integer, "by-thread", or "by-group" */
static int bind_parse_shards(char **args, int cur_arg, struct proxy *px, struct bind_conf *conf, char **err)
{
int val;
@ -1866,6 +1866,8 @@ static int bind_parse_shards(char **args, int cur_arg, struct proxy *px, struct
if (strcmp(args[cur_arg + 1], "by-thread") == 0) {
val = -1; /* -1 = "by-thread", will be fixed in check_config_validity() */
} else if (strcmp(args[cur_arg + 1], "by-group") == 0) {
val = -2; /* -2 = "by-group", will be fixed in check_config_validity() */
} else {
val = atol(args[cur_arg + 1]);
if (val < 1 || val > MAX_THREADS) {