From: Christopher Faulet <cfaulet@haproxy.com>
Date: Fri, 16 Apr 2021 09:24:20 +0000 (+0200)
Subject: BUG/MINOR: logs: Report the true number of retries if there was no connection
X-Git-Tag: v2.4-dev17~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d26f22e0568d6761b1e0a522079b23387bace80;p=thirdparty%2Fhaproxy.git

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

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.
---

diff --git a/src/log.c b/src/log.c
index 79166bfe27..c3437b5cca 100644
--- a/src/log.c
+++ b/src/log.c
@@ -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;