From db522b542efb85a65eda8fb025bda0a5161517cf Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Wed, 2 Sep 2020 07:26:08 +0200 Subject: [PATCH] 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. --- reg-tests/http-rules/acl_cli_spaces.vtc | 6 +++--- .../converters_ipmask_concat_strcmp_field_word.vtc | 12 ++++++------ reg-tests/http-rules/map_redirect.vtc | 6 +++--- reg-tests/http-rules/map_regm_with_backref.vtc | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/reg-tests/http-rules/acl_cli_spaces.vtc b/reg-tests/http-rules/acl_cli_spaces.vtc index e67f7ce5a..55919ea40 100644 --- a/reg-tests/http-rules/acl_cli_spaces.vtc +++ b/reg-tests/http-rules/acl_cli_spaces.vtc @@ -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}" diff --git a/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc b/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc index 7149b183e..3ba47aab5 100644 --- a/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc +++ b/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc @@ -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}" diff --git a/reg-tests/http-rules/map_redirect.vtc b/reg-tests/http-rules/map_redirect.vtc index 995129187..c4a2fbe3e 100644 --- a/reg-tests/http-rules/map_redirect.vtc +++ b/reg-tests/http-rules/map_redirect.vtc @@ -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}" diff --git a/reg-tests/http-rules/map_regm_with_backref.vtc b/reg-tests/http-rules/map_regm_with_backref.vtc index 502e8d376..493726948 100644 --- a/reg-tests/http-rules/map_regm_with_backref.vtc +++ b/reg-tests/http-rules/map_regm_with_backref.vtc @@ -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}"