REGTESTS: Fix prometheus script to perform HTTP health-checks
TCP Health-checks are enabled on server "s2". However it expects to receive
an HTTP requests. So HAProxy configuration must be changed to perform HTTP
health-checks instead. Otherwise, depending on the timing, an error can be
triggered if a check is performed before the end of the script.
This scripts never failed because TCP_QUICKACK was disabled, adding some
latency on health-checks. But since the last fix, it is an issue.
This patch should be backported as far as 2.4.
(cherry picked from commit 529b6a3a2c5e977bd585c75963ef29ce83138a05)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 2ee96bc4a82103c762c54c0150b2b72f6deb76c3)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 8e8ee0c8663600697c6d668a53471c0c9659f97c)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
diff --git a/reg-tests/contrib/prometheus.vtc b/reg-tests/contrib/prometheus.vtc
index ebe0b87..766db47 100644
--- a/reg-tests/contrib/prometheus.vtc
+++ b/reg-tests/contrib/prometheus.vtc
@@ -8,12 +8,12 @@
server s1 {
rxreq
txresp
-} -repeat 2 -start
+} -start
server s2 {
rxreq
txresp
-} -repeat 2 -start
+} -start
haproxy h1 -conf {
defaults
@@ -33,8 +33,9 @@
backend be
stick-table type ip size 1m expire 10s store http_req_rate(10s)
+ option httpchk
server s1 ${s1_addr}:${s1_port}
- server s2 ${s2_addr}:${s2_port} check maxqueue 10 maxconn 12 pool-max-conn 42
+ server s2 ${s2_addr}:${s2_port} check inter 5s maxqueue 10 maxconn 12 pool-max-conn 42
} -start
client c1 -connect ${h1_stats_sock} {