mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-29 06:40:59 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: checks: add linger option to tcp connect

Browse Source 
Allow declaring tcpcheck connect commands with a new parameter,
"linger". This option will configure the connection to avoid using an
RST segment to close, instead following the four-way termination
handshake. Some servers would otherwise log each healthcheck as
an error.
This commit is contained in:
Gaetan Rivet 2020-02-07 15:37:17 +01:00 committed by Christopher Faulet
parent 1afd826ae4
commit f8ba6773e5
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/configuration.txt
View File

@ -9817,6 +9817,8 @@ tcp-check connect [params*]
ssl opens a ciphered connection ssl opens a ciphered connection
linger cleanly close the connection instead of using a single RST.
Examples: Examples:
# check HTTP and HTTPs services on a server. # check HTTP and HTTPs services on a server.
# first open port 80 thanks to server line port directive, then # first open port 80 thanks to server line port directive, then
@ -9836,7 +9838,7 @@ tcp-check connect [params*]
# check both POP and IMAP from a single server: # check both POP and IMAP from a single server:
option tcp-check option tcp-check
tcp-check connect port 110 tcp-check connect port 110 linger
tcp-check expect string +OK\ POP3\ ready tcp-check expect string +OK\ POP3\ ready
tcp-check connect port 143 tcp-check connect port 143
tcp-check expect string *\ OK\ IMAP4\ ready tcp-check expect string *\ OK\ IMAP4\ ready

1
include/types/checks.h
View File

@ -223,6 +223,7 @@ enum tcpcheck_rule_type {
#define TCPCHK_OPT_NONE 0x0000 /* no options specified, default */ #define TCPCHK_OPT_NONE 0x0000 /* no options specified, default */
#define TCPCHK_OPT_SEND_PROXY 0x0001 /* send proxy-protocol string */ #define TCPCHK_OPT_SEND_PROXY 0x0001 /* send proxy-protocol string */
#define TCPCHK_OPT_SSL 0x0002 /* SSL connection */ #define TCPCHK_OPT_SSL 0x0002 /* SSL connection */
#define TCPCHK_OPT_LINGER 0x0004 /* Do not RST connection, let it linger */
struct tcpcheck_rule { struct tcpcheck_rule {
struct list list; /* list linked to from the proxy */ struct list list; /* list linked to from the proxy */

8
src/cfgparse-listen.c
View File

@ -3097,6 +3097,10 @@ stats_error_parsing:
cur_arg++; cur_arg++;
} }
#endif /* USE_OPENSSL */ #endif /* USE_OPENSSL */
else if (strcmp(args[cur_arg], "linger") == 0) {
tcpcheck->conn_opts |= TCPCHK_OPT_LINGER;
cur_arg++;
}
/* comment for this tcpcheck line */ /* comment for this tcpcheck line */
else if (strcmp(args[cur_arg], "comment") == 0) { else if (strcmp(args[cur_arg], "comment") == 0) {
if (!*args[cur_arg + 1]) { if (!*args[cur_arg + 1]) {
@ -3110,9 +3114,9 @@ stats_error_parsing:
} }
else { else {
#ifdef USE_OPENSSL #ifdef USE_OPENSSL
ha_alert("parsing [%s:%d] : '%s %s' expects 'comment', 'port', 'send-proxy' or 'ssl' but got '%s' as argument.\n", ha_alert("parsing [%s:%d] : '%s %s' expects 'comment', 'port', 'send-proxy', 'ssl' or 'linger' but got '%s' as argument.\n",
#else /* USE_OPENSSL */ #else /* USE_OPENSSL */
ha_alert("parsing [%s:%d] : '%s %s' expects 'comment', 'port', 'send-proxy' or but got '%s' as argument.\n", ha_alert("parsing [%s:%d] : '%s %s' expects 'comment', 'port', 'send-proxy' or 'linger' but got '%s' as argument.\n",
#endif /* USE_OPENSSL */ #endif /* USE_OPENSSL */
file, linenum, args[0], args[1], args[cur_arg]); file, linenum, args[0], args[1], args[cur_arg]);
err_code |= ERR_ALERT | ERR_FATAL; err_code |= ERR_ALERT | ERR_FATAL;

6
src/checks.c
View File

@ -2993,6 +2993,12 @@ static int tcpcheck_main(struct check *check)
ret = SF_ERR_RESOURCE; ret = SF_ERR_RESOURCE;
} }
if (conn_ctrl_ready(conn) &&
check->current_step->conn_opts & TCPCHK_OPT_LINGER) {
/* Some servers don't like reset on close */
fdtab[cs->conn->handle.fd].linger_risk = 0;
}
/* It can return one of : /* It can return one of :
* - SF_ERR_NONE if everything's OK * - SF_ERR_NONE if everything's OK
* - SF_ERR_SRVTO if there are no more servers * - SF_ERR_SRVTO if there are no more servers