From 0d142e0756986b56819ecb2d131a0c4b30ae899f Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Tue, 27 Aug 2024 19:09:08 +0200 Subject: [PATCH] MINOR: proxy: Add support of 429-Too-Many-Requests in retry-on status The "429" status can now be specified on retry-on directives. PR_RE_* flags were updated to remains sorted. This patch should fix the issue #2687. It is quite simple so it may safely be backported to 3.0 if necessary. --- doc/configuration.txt | 7 ++++--- include/haproxy/proxy-t.h | 17 +++++++++-------- src/proxy.c | 2 ++ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/doc/configuration.txt b/doc/configuration.txt index 155aa1a902..26d63e6692 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -11337,9 +11337,10 @@ retry-on [space-delimited list of keywords] any HTTP status code among "401" (Unauthorized), "403" (Forbidden), "404" (Not Found), "408" (Request Timeout), - "425" (Too Early), "500" (Server Error), "501" (Not - Implemented), "502" (Bad Gateway), "503" (Service - Unavailable), "504" (Gateway Timeout). + "425" (Too Early), "429" (Too Many Requests), "500" + (Server Error), "501" (Not Implemented), "502" + (Bad Gateway), "503" (Service Unavailable), "504" + (Gateway Timeout). all-retryable-errors retry request for any error that are considered diff --git a/include/haproxy/proxy-t.h b/include/haproxy/proxy-t.h index eb6a22427b..74b4ab6d64 100644 --- a/include/haproxy/proxy-t.h +++ b/include/haproxy/proxy-t.h @@ -193,15 +193,16 @@ enum PR_SRV_STATE_FILE { #define PR_RE_404 0x00000020 /* Retry if we got a 404 */ #define PR_RE_408 0x00000040 /* Retry if we got a 408 */ #define PR_RE_425 0x00000080 /* Retry if we got a 425 */ -#define PR_RE_500 0x00000100 /* Retry if we got a 500 */ -#define PR_RE_501 0x00000200 /* Retry if we got a 501 */ -#define PR_RE_502 0x00000400 /* Retry if we got a 502 */ -#define PR_RE_503 0x00000800 /* Retry if we got a 503 */ -#define PR_RE_504 0x00001000 /* Retry if we got a 504 */ +#define PR_RE_429 0x00000100 /* Retry if we got a 429 */ +#define PR_RE_500 0x00000200 /* Retry if we got a 500 */ +#define PR_RE_501 0x00000400 /* Retry if we got a 501 */ +#define PR_RE_502 0x00000800 /* Retry if we got a 502 */ +#define PR_RE_503 0x00001000 /* Retry if we got a 503 */ +#define PR_RE_504 0x00002000 /* Retry if we got a 504 */ #define PR_RE_STATUS_MASK (PR_RE_401 | PR_RE_403 | PR_RE_404 | \ - PR_RE_408 | PR_RE_425 | PR_RE_500 | \ - PR_RE_501 | PR_RE_502 | PR_RE_503 | \ - PR_RE_504) + PR_RE_408 | PR_RE_425 | PR_RE_429 | \ + PR_RE_500 | PR_RE_501 | PR_RE_502 | \ + PR_RE_503 | PR_RE_504) /* 0x00000800, 0x00001000, 0x00002000, 0x00004000 and 0x00008000 unused, * reserved for eventual future status codes */ diff --git a/src/proxy.c b/src/proxy.c index 25dd136dad..89a337081f 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -855,6 +855,8 @@ proxy_parse_retry_on(char **args, int section, struct proxy *curpx, curpx->retry_type |= PR_RE_408; else if (strcmp(args[i], "425") == 0) curpx->retry_type |= PR_RE_425; + else if (strcmp(args[i], "429") == 0) + curpx->retry_type |= PR_RE_429; else if (strcmp(args[i], "500") == 0) curpx->retry_type |= PR_RE_500; else if (strcmp(args[i], "501") == 0) -- 2.39.5