REGTEST: increase some short timeouts to make tests more reliable

A few regtests continue to regularly fail in highly loaded VMs because
they have very short timeouts. Actually the goal of running with short
timeouts was to make sure we do not uselessly wait during tests designed
to trigger them, but these timeouts here are never supposed to fire at
all, so they don't need to be kept in the 15-20ms range. They do not
pose any issue on any regular machine, but VMs are often suffering from
huge time jumps and cannot always produce responses in that short of a
time.

Just like with commit ce6fc25b1 ("REGTEST: increase timeouts on the
seamless-reload test"), let's raise these short timeouts to 1 second.
A few other ones remain set to 150-200ms and do not seem to cause any
issue. Some are actually expected to trigger so let's not touch them
for now.
This commit is contained in:
Willy Tarreau 2020-09-02 07:26:08 +02:00
parent 17254939c5
commit db522b542e
4 changed files with 15 additions and 15 deletions

View File

@ -15,9 +15,9 @@ haproxy h1 -W -S -conf {
${no-htx} option http-use-htx
log global
option httplog
timeout connect 15ms
timeout client 20ms
timeout server 20ms
timeout connect 1s
timeout client 1s
timeout server 1s
frontend fe1
bind "fd@${fe1}"

View File

@ -75,9 +75,9 @@ haproxy h1 -conf {
${no-htx} option http-use-htx
log global
option httplog
timeout connect 15ms
timeout client 20ms
timeout server 20ms
timeout connect 1s
timeout client 1s
timeout server 1s
frontend fe1
# accept-proxy so test client can send src ip
@ -131,9 +131,9 @@ haproxy h2 -conf {
${no-htx} option http-use-htx
log global
option httplog
timeout connect 15ms
timeout client 20ms
timeout server 20ms
timeout connect 1s
timeout client 1s
timeout server 1s
frontend fe2
bind "fd@${fe2}"

View File

@ -38,9 +38,9 @@ haproxy h1 -conf {
${no-htx} option http-use-htx
log global
option httplog
timeout connect 15ms
timeout client 20ms
timeout server 20ms
timeout connect 1s
timeout client 1s
timeout server 1s
frontend fe1
bind "fd@${fe1}"

View File

@ -46,9 +46,9 @@ haproxy h1 -conf {
${no-htx} option http-use-htx
log global
option httplog
timeout connect 15ms
timeout client 20ms
timeout server 20ms
timeout connect 1s
timeout client 1s
timeout server 1s
frontend fe1
bind "fd@${fe1}"