mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: stream: Decrement server current session counter on L7 retry

Browse Source 
When a L7 retry is performed, we must not forget to decrement the current
session counter of the assigned server. Of course, it must only be done if
the current session is already counted on the server, thus if SF_CURR_SESS
flag is set on the stream.

This patch is related to the issue #1003. It must be backported as far as
2.0.
This commit is contained in:
Christopher Faulet 2021-05-05 18:23:59 +02:00
parent 10a8670f28
commit e763c8c99f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/http_ana.c
View File

@ -1295,8 +1295,13 @@ static __inline int do_l7_retry(struct stream *s, struct stream_interface *si)
if (b_is_null(&req->buf) && !channel_alloc_buffer(req, &s->buffer_wait)) if (b_is_null(&req->buf) && !channel_alloc_buffer(req, &s->buffer_wait))
goto no_retry; goto no_retry;
if (objt_server(s->target)) if (objt_server(s->target)) {
if (s->flags & SF_CURR_SESS) {
s->flags &= ~SF_CURR_SESS;
_HA_ATOMIC_DEC(&__objt_server(s->target)->cur_sess);
}
_HA_ATOMIC_INC(&__objt_server(s->target)->counters.retries); _HA_ATOMIC_INC(&__objt_server(s->target)->counters.retries);
}
_HA_ATOMIC_INC(&s->be->be_counters.retries); _HA_ATOMIC_INC(&s->be->be_counters.retries);
/* Remove any write error from the request, and read error from the response */ /* Remove any write error from the request, and read error from the response */