upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-03-28 13:24:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

BUG/MINOR: tcpcheck: Don't rearm the check timeout on each read

Browse source 
The check timeout is used to limit a health-check execution. By default
inter timeout is used. But when defined the check timeout is used. In this
case, the inter timeout (or connect timeout) is used for the connection
establishment only. And the check timeout for the health-check
execution. Thus, it must be set after a successfull connect. It means it is
rearm at the end of each connect rule.

This patch with the previous one (BUG/MINOR: http-check: Use right condition
to consider HTX message as full) should solve the issue #991. It must be
backported as far as 2.2. On the 2.3 and 2.2, there are 2 places were the
connection establishement is handled. The check timeout must be set on both.
This commit is contained in:
Christopher Faulet 2020-12-09 19:46:38 +01:00
parent 3f527197cd
commit c878f56f7c
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/tcpcheck.c
View file

@ -1206,6 +1206,10 @@ enum tcpcheck_eval_ret tcpcheck_eval_connect(struct check *check, struct tcpchec
out:
if (conn && check->result == CHK_RES_FAILED)
conn->flags |= CO_FL_ERROR;
if (ret == TCPCHK_EVAL_CONTINUE && check->proxy->timeout.check)
check->task->expire = tick_add_ifset(now_ms, check->proxy->timeout.check);
return ret;
}
@ -2040,9 +2044,6 @@ int tcpcheck_main(struct check *check)
case TCPCHK_ACT_EXPECT:
check->current_step = rule;
if (must_read) {
if (check->proxy->timeout.check)
check->task->expire = tick_add_ifset(now_ms, check->proxy->timeout.check);
eval_ret = tcpcheck_eval_recv(check, rule);
if (eval_ret == TCPCHK_EVAL_STOP)
goto out_end_tcpcheck;