upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-15 21:59:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

CLEANUP: proxy: mention that px->conn_retries isn't relevant in some cases

Browse source 
Since 91e785edc ("MINOR: stream: Rely on a per-stream max connection
retries value"), px->conn_retries may be ignored in the following cases:

 * proxy not part of a list which gets properly post-init (ie: main proxy
   list, log-forward list, sink list)
 * proxy lacking the CAP_FE capability

Documenting such cases where the px->conn_retries is set but effectively
ignored, so that we either remove ignored statements or fix them in
the future if they are really needed. In fact all cases affected here are
automomous applets that already handle the retries themselves so the fact
that 91e785edc made ->conn_retries ineffective should not be a big deal
anyway.
This commit is contained in:
Aurelien DARRAGON 2025-04-28 16:52:33 +02:00
parent 5288b39011
commit bd48e26a74
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/peers.c
View file

@ -3237,7 +3237,12 @@ void peers_setup_frontend(struct proxy *fe)
{
fe->mode = PR_MODE_PEERS;
fe->maxconn = 0;
fe->conn_retries = CONN_RETRIES;
fe->conn_retries = CONN_RETRIES; /* FIXME ignored since 91e785ed
* ("MINOR: stream: Rely on a per-stream max connection retries value")
* If this is really expected this should be set on the stream directly
* because the proxy is not part of the main proxy list and thus
* lacks the required post init for this setting to be considered
*/
fe->timeout.connect = MS_TO_TICKS(1000);
fe->timeout.client = MS_TO_TICKS(5000);
fe->timeout.server = MS_TO_TICKS(5000);

6
src/resolvers.c
View file

@ -3357,6 +3357,12 @@ void resolvers_setup_proxy(struct proxy *px)
{
px->maxconn = 0;
px->conn_retries = 1;
px->conn_retries = 1; /* FIXME ignored since 91e785ed
* ("MINOR: stream: Rely on a per-stream max connection retries value")
* If this is really expected this should be set on the stream directly
* because the proxy is not part of the main proxy list and thus
* lacks the required post init for this setting to be considered
*/
px->timeout.server = TICK_ETERNITY;
px->timeout.client = TICK_ETERNITY;
px->timeout.connect = 1000; // by default same than timeout.resolve

6
src/sink.c
View file

@ -401,7 +401,11 @@ static int cli_parse_show_events(char **args, char *payload, struct appctx *appc
void sink_setup_proxy(struct proxy *px)
{
px->maxconn = 0;
px->conn_retries = 1;
px->conn_retries = 1; /* FIXME ignored since 91e785ed
* ("MINOR: stream: Rely on a per-stream max connection retries value")
* If this is really expected this should be set on the stream directly
* because the proxy lacks the CAP_FE so this setting is not considered
*/
px->timeout.server = TICK_ETERNITY;
px->timeout.client = TICK_ETERNITY;
px->timeout.connect = TICK_ETERNITY;