mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2026-01-18 07:11:00 +01:00
BUG/MINOR: http-ana: Don't increment conn_retries counter before the L7 retry
When we are about to perform a L7 retry, we deal with the conn_retries counter, to be sure we can retry. However, there is an issue here because the counter is incremented before it is checked against the backend limit. So, we can miss a connection retry. Of course, we must invert both operation. The conn_retries counter must be incremented after the check agains the backend limit. This patch must be backported as far as 2.6.
This commit is contained in:
parent
caa16549b8
commit
41ade746c7
@ -1118,10 +1118,9 @@ static __inline int do_l7_retry(struct stream *s, struct stconn *sc)
|
||||
struct channel *req, *res;
|
||||
int co_data;
|
||||
|
||||
s->conn_retries++;
|
||||
if (s->conn_retries >= s->be->conn_retries)
|
||||
return -1;
|
||||
|
||||
s->conn_retries++;
|
||||
if (objt_server(s->target)) {
|
||||
if (s->flags & SF_CURR_SESS) {
|
||||
s->flags &= ~SF_CURR_SESS;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user