mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 15:47:01 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: logs: Report the true number of retries if there was no connection

Browse Source 
When the session is aborted before any connection attempt to any server, the
number of connection retries reported in the logs is wrong. It happens
because when the retries counter is not strictly positive, we consider the
max number of retries was reached and the backend retries value is used. It
is obviously wrong when no connectioh was performed.

In fact, at this stage, the retries counter is initialized to 0. But the
backend stream-interface is in the INI state. Once it is set to SI_ST_REQ,
the counter is set to the backend value. And it is the only possible state
transition from INI state. Thus it is safe to rely on it to fix the bug.

This patch must be backported to all stable versions.
This commit is contained in:
Christopher Faulet 2021-04-16 11:24:20 +02:00
parent a7d6cf24fb
commit 1d26f22e05
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/log.c
View File

@ -2797,9 +2797,10 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
case LOG_FMT_RETRIES: // %rq
if (s_flags & SF_REDISP)
LOGCHAR('+');
ret = ltoa_o((s && s->si[1].conn_retries > 0) ?
(be->conn_retries - s->si[1].conn_retries) :
be->conn_retries, tmplog, dst + maxsize - tmplog);
ret = ltoa_o(((s && s->si[1].conn_retries > 0)
? (be->conn_retries - s->si[1].conn_retries)
: ((s && s->si[1].state != SI_ST_INI) ? be->conn_retries : 0)),
tmplog, dst + maxsize - tmplog);
if (ret == NULL)
goto out;
tmplog = ret;