mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 23:56:57 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: config: fix NUMA topology detection on FreeBSD

Browse Source 
In 2.6-dev1, NUMA topology detection was enabled on FreeBSD with commit
f5d48f8b3 ("MEDIUM: cfgparse: numa detect topology on FreeBSD."). But
it suffers from a minor bug which is that it forgets to check for the
number of domains and always emits a confusing warning indicating that
multiple sockets were found while it's not the case.

This can be backported to 2.6.
This commit is contained in:
Willy Tarreau 2023-04-22 19:26:07 +02:00
parent 997ad155fe
commit e1a0107f9c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cfgparse.c
View File

@ -2701,6 +2701,9 @@ static int numa_detect_topology()
BUG_ON(ndomains > MAXMEMDOM); BUG_ON(ndomains > MAXMEMDOM);
ha_cpuset_zero(&node_cpu_set); ha_cpuset_zero(&node_cpu_set);
if (ndomains < 2)
goto leave;
/* /*
* We retrieve the first active valid CPU domain * We retrieve the first active valid CPU domain
* with active cpu and binding it, we returns * with active cpu and binding it, we returns
@ -2726,7 +2729,7 @@ static int numa_detect_topology()
} }
break; break;
} }
leave:
return ha_cpuset_count(&node_cpu_set); return ha_cpuset_count(&node_cpu_set);
} }