MAJOR: config: remove parsing of the global "nbproc" directive
This one was deprecated in 2.3 and marked for removal in 2.5. It suffers
too many limitations compared to threads, and prevents some improvements
from being engaged. Instead of a bypassable startup error, there is now
a hard error.
The parsing code was removed, and very few obvious cases were as well.
The code is deeply rooted at certain places (e.g. "for" loops iterating
from 0 to nbproc) so it will not be that trivial to remove everywhere.
The "bind" and "bind-process" parsers will have to be adjusted, though
maybe not completely changed if we later want to support thread groups
for large NUMA machines. Some stats socket restrictions were removed,
and the doc was updated according to what was done. A few places in the
doc still refer to nbproc and will have to be revisited. The master-worker
code also refers to the process number to distinguish between master and
workers and will have to be carefully adjusted. The MAX_PROCS macro was
reset to 1, this will at least reduce the size of some remaining arrays.
Two regtests were dependieng on this directive, one with an explicit
"nbproc 1" and another one testing the master's CLI using nbproc 4.
Both were adapted.
diff --git a/reg-tests/connection/proxy_protocol_random_fail.vtc b/reg-tests/connection/proxy_protocol_random_fail.vtc
index 135908e..8884daa 100644
--- a/reg-tests/connection/proxy_protocol_random_fail.vtc
+++ b/reg-tests/connection/proxy_protocol_random_fail.vtc
@@ -24,7 +24,6 @@
haproxy h1 -conf {
global
- nbproc 4
tune.ssl.default-dh-param 2048
stats bind-process 1
log ${Slog_1_addr}:${Slog_1_port} len 2048 local0 debug err
@@ -37,13 +36,11 @@
log global
listen http
- bind-process 1
bind unix@"${tmpdir}/http.socket" accept-proxy name ssl-offload-http
option forwardfor
listen ssl-offload-http
option httplog
- bind-process 2-4
bind "fd@${ssl}" ssl crt ${testdir}/common.pem ssl no-sslv3 alpn h2,http/1.1
server http unix@"${tmpdir}/http.socket" send-proxy
} -start
diff --git a/reg-tests/mcli/mcli_show_info.vtc b/reg-tests/mcli/mcli_show_info.vtc
index e98121c..e9d8ff6 100644
--- a/reg-tests/mcli/mcli_show_info.vtc
+++ b/reg-tests/mcli/mcli_show_info.vtc
@@ -1,4 +1,4 @@
-varnishtest "Show info of process 3"
+varnishtest "Show info of process 1"
#REQUIRE_VERSION=1.9
@@ -9,8 +9,6 @@
} -start
haproxy h1 -W -S -conf {
- global
- nbproc 4
defaults
mode http
timeout connect 1s
@@ -26,6 +24,6 @@
} -start
haproxy h1 -mcli {
- send "@3 show info"
- expect ~ ".*\nProcess_num: 3\n.*"
+ send "@1 show info"
+ expect ~ ".*\nProcess_num: 1\n.*"
} -wait
diff --git a/reg-tests/mcli/mcli_start_progs.vtc b/reg-tests/mcli/mcli_start_progs.vtc
index ec0219a..08de157 100644
--- a/reg-tests/mcli/mcli_start_progs.vtc
+++ b/reg-tests/mcli/mcli_start_progs.vtc
@@ -10,8 +10,6 @@
} -start
haproxy h1 -W -S -conf {
- global
- nbproc 1
defaults
mode http
timeout connect 1s