RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-19 04:07:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: stream: Rely on a per-stream max connection retries value

Browse Source 
Instead of directly relying on the backend parameter to limit the number of
connection retries, we now use a per-stream value. This value is by default
inherited from the backend value when it is set. So for now, there is no
change except the stream value is used instead of the backend value. But
thanks to this change, it will be possible to dynamically change this value.
This commit is contained in:
Christopher Faulet 2024-09-25 15:05:07 +02:00
parent 0d91de2be4
commit 91e785edc9
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/haproxy/stream-t.h
View File

@ -234,6 +234,7 @@ struct stream {
* This is a bit field of TASK_WOKEN_* */
int conn_retries; /* number of connect retries performed */
unsigned int conn_exp; /* wake up time for connect, queue, turn-around, ... */
unsigned int max_retries; /* Maximum number of connection retried (=0 is backend is not set) */
unsigned int conn_err_type; /* first error detected, one of STRM_ET_* */
struct stream *parent; /* Pointer to the parent stream, if any. NULL most of time */

2
include/haproxy/stream.h
View File

@ -350,7 +350,7 @@ static inline void stream_choose_redispatch(struct stream *s)
(((s->be->redispatch_after > 0) &&
(s->conn_retries % s->be->redispatch_after == 0)) ||
((s->be->redispatch_after < 0) &&
(s->conn_retries % (s->be->conn_retries + 1 + s->be->redispatch_after) == 0))) ||
(s->conn_retries % (s->max_retries + 1 + s->be->redispatch_after) == 0))) ||
(!(s->flags & SF_DIRECT) && s->be->srv_act > 1 &&
((s->be->lbprm.algo & BE_LB_KIND) != BE_LB_KIND_HI)))) {
sess_change_server(s, NULL);

6
src/backend.c
View File

@ -1324,7 +1324,7 @@ static int do_connect_server(struct stream *s, struct connection *conn)
if (co_data(&s->res))
conn_flags |= CONNECT_HAS_DATA;
if (s->conn_retries == s->be->conn_retries)
if (s->conn_retries == s->max_retries)
conn_flags |= CONNECT_CAN_USE_TFO;
if (!conn_ctrl_ready(conn) || !conn_xprt_ready(conn)) {
ret = conn->ctrl->connect(conn, conn_flags);
@ -2402,13 +2402,13 @@ void back_handle_st_cer(struct stream *s)
* provided by the client and we don't want to let the
* client provoke retries.
*/
s->conn_retries = s->be->conn_retries;
s->conn_retries = s->max_retries;
DBG_TRACE_DEVEL("Bad SSL cert, disable connection retries", STRM_EV_STRM_PROC|STRM_EV_CS_ST|STRM_EV_STRM_ERR, s);
}
}
/* ensure that we have enough retries left */
if (s->conn_retries >= s->be->conn_retries || !(s->be->retry_type & PR_RE_CONN_FAILED)) {
if (s->conn_retries >= s->max_retries || !(s->be->retry_type & PR_RE_CONN_FAILED)) {
if (!s->conn_err_type) {
s->conn_err_type = STRM_ET_CONN_ERR;
}

2
src/http_ana.c
View File

@ -1142,7 +1142,7 @@ static __inline int do_l7_retry(struct stream *s, struct stconn *sc)
struct channel *req, *res;
int co_data;
if (s->conn_retries >= s->be->conn_retries)
if (s->conn_retries >= s->max_retries)
return -1;
s->conn_retries++;
if (objt_server(s->target)) {

5
src/stream.c
View File

@ -430,7 +430,7 @@ struct stream *stream_new(struct session *sess, struct stconn *sc, struct buffer
s->task = t;
s->pending_events = 0;
s->conn_retries = 0;
s->conn_retries = s->max_retries = 0;
s->conn_exp = TICK_ETERNITY;
s->conn_err_type = STRM_ET_NONE;
s->prev_conn_state = SC_ST_INI;
@ -1123,6 +1123,9 @@ static int process_switching_rules(struct stream *s, struct channel *req, int an
}
/* Se the max connection retries for the stream. */
s->max_retries = s->be->conn_retries;
/* we don't want to run the TCP or HTTP filters again if the backend has not changed */
if (fe == s->be) {
s->req.analysers &= ~AN_REQ_INSPECT_BE;