RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-24 13:42:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: Attach tcpcheck_rules to check

Browse Source 
This is to allow checks to be established whose tcpcheck_rules
are not those of its proxy.

Signed-off-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
Simon Horman 2015-01-30 11:22:57 +09:00 committed by Willy Tarreau
parent 41f5876750
commit e16c1b3f3d
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/types/checks.h
View File

@ -166,6 +166,7 @@ struct check {
char desc[HCHK_DESC_LEN]; /* health check description */ char desc[HCHK_DESC_LEN]; /* health check description */
int use_ssl; /* use SSL for health checks */ int use_ssl; /* use SSL for health checks */
int send_proxy; /* send a PROXY protocol header with checks */ int send_proxy; /* send a PROXY protocol header with checks */
struct list *tcpcheck_rules; /* tcp-check send / expect rules */
struct tcpcheck_rule *current_step; /* current step when using tcpcheck */ struct tcpcheck_rule *current_step; /* current step when using tcpcheck */
struct tcpcheck_rule *last_started_step;/* pointer to latest tcpcheck rule started */ struct tcpcheck_rule *last_started_step;/* pointer to latest tcpcheck rule started */
int inter, fastinter, downinter; /* checks: time in milliseconds */ int inter, fastinter, downinter; /* checks: time in milliseconds */

34
src/checks.c
View File

@ -60,7 +60,7 @@
#include <proto/task.h> #include <proto/task.h>
static int httpchk_expect(struct server *s, int done); static int httpchk_expect(struct server *s, int done);
static int tcpcheck_get_step_id(struct server *); static int tcpcheck_get_step_id(struct check *);
static void tcpcheck_main(struct connection *); static void tcpcheck_main(struct connection *);
static const struct check_status check_statuses[HCHK_STATUS_SIZE] = { static const struct check_status check_statuses[HCHK_STATUS_SIZE] = {
@ -620,7 +620,7 @@ static void chk_report_conn_err(struct connection *conn, int errno_bck, int expi
chk = get_trash_chunk(); chk = get_trash_chunk();
if (check->type == PR_O2_TCPCHK_CHK) { if (check->type == PR_O2_TCPCHK_CHK) {
step = tcpcheck_get_step_id(check->server); step = tcpcheck_get_step_id(check);
if (!step) if (!step)
chunk_printf(chk, " at initial connection step of tcp-check"); chunk_printf(chk, " at initial connection step of tcp-check");
else { else {
@ -1463,8 +1463,8 @@ static int connect_conn_chk(struct task *t)
/* only plain tcp-check supports quick ACK */ /* only plain tcp-check supports quick ACK */
quickack = check->type == 0 || check->type == PR_O2_TCPCHK_CHK; quickack = check->type == 0 || check->type == PR_O2_TCPCHK_CHK;
if (check->type == PR_O2_TCPCHK_CHK && !LIST_ISEMPTY(&s->proxy->tcpcheck_rules)) { if (check->type == PR_O2_TCPCHK_CHK && !LIST_ISEMPTY(check->tcpcheck_rules)) {
struct tcpcheck_rule *r = (struct tcpcheck_rule *) s->proxy->tcpcheck_rules.n; struct tcpcheck_rule *r = (struct tcpcheck_rule *) check->tcpcheck_rules->n;
/* if first step is a 'connect', then tcpcheck_main must run it */ /* if first step is a 'connect', then tcpcheck_main must run it */
if (r->action == TCPCHK_ACT_CONNECT) { if (r->action == TCPCHK_ACT_CONNECT) {
tcpcheck_main(conn); tcpcheck_main(conn);
@ -2351,23 +2351,23 @@ static int httpchk_expect(struct server *s, int done)
/* /*
* return the id of a step in a send/expect session * return the id of a step in a send/expect session
*/ */
static int tcpcheck_get_step_id(struct server *s) static int tcpcheck_get_step_id(struct check *check)
{ {
struct tcpcheck_rule *cur = NULL, *next = NULL; struct tcpcheck_rule *cur = NULL, *next = NULL;
int i = 0; int i = 0;
/* not even started anything yet => step 0 = initial connect */ /* not even started anything yet => step 0 = initial connect */
if (!s->check.current_step) if (check->current_step)
return 0; return 0;
cur = s->check.last_started_step; cur = check->last_started_step;
/* no step => first step */ /* no step => first step */
if (cur == NULL) if (cur == NULL)
return 1; return 1;
/* increment i until current step */ /* increment i until current step */
list_for_each_entry(next, &s->proxy->tcpcheck_rules, list) { list_for_each_entry(next, check->tcpcheck_rules, list) {
if (next->list.p == &cur->list) if (next->list.p == &cur->list)
break; break;
++i; ++i;
@ -2384,7 +2384,7 @@ static void tcpcheck_main(struct connection *conn)
struct check *check = conn->owner; struct check *check = conn->owner;
struct server *s = check->server; struct server *s = check->server;
struct task *t = check->task; struct task *t = check->task;
struct list *head = &s->proxy->tcpcheck_rules; struct list *head = check->tcpcheck_rules;
/* here, we know that the check is complete or that it failed */ /* here, we know that the check is complete or that it failed */
if (check->result != CHK_RES_UNKNOWN) if (check->result != CHK_RES_UNKNOWN)
@ -2565,14 +2565,14 @@ static void tcpcheck_main(struct connection *conn)
case SN_ERR_SRVTO: /* ETIMEDOUT */ case SN_ERR_SRVTO: /* ETIMEDOUT */
case SN_ERR_SRVCL: /* ECONNREFUSED, ENETUNREACH, ... */ case SN_ERR_SRVCL: /* ECONNREFUSED, ENETUNREACH, ... */
chunk_printf(&trash, "TCPCHK error establishing connection at step %d: %s", chunk_printf(&trash, "TCPCHK error establishing connection at step %d: %s",
tcpcheck_get_step_id(s), strerror(errno)); tcpcheck_get_step_id(check), strerror(errno));
set_server_check_status(check, HCHK_STATUS_L4CON, trash.str); set_server_check_status(check, HCHK_STATUS_L4CON, trash.str);
goto out_end_tcpcheck; goto out_end_tcpcheck;
case SN_ERR_PRXCOND: case SN_ERR_PRXCOND:
case SN_ERR_RESOURCE: case SN_ERR_RESOURCE:
case SN_ERR_INTERNAL: case SN_ERR_INTERNAL:
chunk_printf(&trash, "TCPCHK error establishing connection at step %d", chunk_printf(&trash, "TCPCHK error establishing connection at step %d",
tcpcheck_get_step_id(s)); tcpcheck_get_step_id(check));
set_server_check_status(check, HCHK_STATUS_SOCKERR, trash.str); set_server_check_status(check, HCHK_STATUS_SOCKERR, trash.str);
goto out_end_tcpcheck; goto out_end_tcpcheck;
} }
@ -2620,7 +2620,7 @@ static void tcpcheck_main(struct connection *conn)
if (check->current_step->string_len >= check->bo->size) { if (check->current_step->string_len >= check->bo->size) {
chunk_printf(&trash, "tcp-check send : string too large (%d) for buffer size (%d) at step %d", chunk_printf(&trash, "tcp-check send : string too large (%d) for buffer size (%d) at step %d",
check->current_step->string_len, check->bo->size, check->current_step->string_len, check->bo->size,
tcpcheck_get_step_id(s)); tcpcheck_get_step_id(check));
set_server_check_status(check, HCHK_STATUS_L7RSP, trash.str); set_server_check_status(check, HCHK_STATUS_L7RSP, trash.str);
goto out_end_tcpcheck; goto out_end_tcpcheck;
} }
@ -2681,7 +2681,7 @@ static void tcpcheck_main(struct connection *conn)
/* empty response */ /* empty response */
chunk_printf(&trash, "TCPCHK got an empty response at step %d", chunk_printf(&trash, "TCPCHK got an empty response at step %d",
tcpcheck_get_step_id(s)); tcpcheck_get_step_id(check));
set_server_check_status(check, HCHK_STATUS_L7RSP, trash.str); set_server_check_status(check, HCHK_STATUS_L7RSP, trash.str);
goto out_end_tcpcheck; goto out_end_tcpcheck;
@ -2706,12 +2706,12 @@ static void tcpcheck_main(struct connection *conn)
/* we were looking for a string */ /* we were looking for a string */
if (cur->string != NULL) { if (cur->string != NULL) {
chunk_printf(&trash, "TCPCHK matched unwanted content '%s' at step %d", chunk_printf(&trash, "TCPCHK matched unwanted content '%s' at step %d",
cur->string, tcpcheck_get_step_id(s)); cur->string, tcpcheck_get_step_id(check));
} }
else { else {
/* we were looking for a regex */ /* we were looking for a regex */
chunk_printf(&trash, "TCPCHK matched unwanted content (regex) at step %d", chunk_printf(&trash, "TCPCHK matched unwanted content (regex) at step %d",
tcpcheck_get_step_id(s)); tcpcheck_get_step_id(check));
} }
set_server_check_status(check, HCHK_STATUS_L7RSP, trash.str); set_server_check_status(check, HCHK_STATUS_L7RSP, trash.str);
goto out_end_tcpcheck; goto out_end_tcpcheck;
@ -2740,12 +2740,12 @@ static void tcpcheck_main(struct connection *conn)
/* we were looking for a string */ /* we were looking for a string */
if (cur->string != NULL) { if (cur->string != NULL) {
chunk_printf(&trash, "TCPCHK did not match content '%s' at step %d", chunk_printf(&trash, "TCPCHK did not match content '%s' at step %d",
cur->string, tcpcheck_get_step_id(s)); cur->string, tcpcheck_get_step_id(check));
} }
else { else {
/* we were looking for a regex */ /* we were looking for a regex */
chunk_printf(&trash, "TCPCHK did not match content (regex) at step %d", chunk_printf(&trash, "TCPCHK did not match content (regex) at step %d",
tcpcheck_get_step_id(s)); tcpcheck_get_step_id(check));
} }
set_server_check_status(check, HCHK_STATUS_L7RSP, trash.str); set_server_check_status(check, HCHK_STATUS_L7RSP, trash.str);
goto out_end_tcpcheck; goto out_end_tcpcheck;

1
src/server.c
View File

@ -941,6 +941,7 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr
newsrv->check.fall = curproxy->defsrv.check.fall; newsrv->check.fall = curproxy->defsrv.check.fall;
newsrv->check.health = newsrv->check.rise; /* up, but will fall down at first failure */ newsrv->check.health = newsrv->check.rise; /* up, but will fall down at first failure */
newsrv->check.server = newsrv; newsrv->check.server = newsrv;
newsrv->check.tcpcheck_rules = &curproxy->tcpcheck_rules;
newsrv->agent.status = HCHK_STATUS_INI; newsrv->agent.status = HCHK_STATUS_INI;
newsrv->agent.rise = curproxy->defsrv.agent.rise; newsrv->agent.rise = curproxy->defsrv.agent.rise;