This is in preparation for associating a agent check
with a server which runs as well as the server's existing check.
The split has been made by:
* Moving elements of struct server's check element that will
be shared by both checks into a new check_common element
of struct server.
* Moving the remaining elements to a new struct check and
making struct server's check element a struct check.
* Adding a server element to struct check, a back-pointer
to the server element it is a member of.
- At this time the server could be obtained using
container_of, however, this will not be so easy
once a second struct check element is added to struct server
to accommodate an agent health check.
Signed-off-by: Simon Horman <ho...@verge.net.au>
---
v6
* Correct use of srv->check_common.xprt ssl_sock_prepare_srv_ctx().
Previously srv->check.xprt was used which causes a build failure
when compiled with make USE_OPENSSL=1 ...
Thanks to Scott McKeown for discovering this.
v2 - v5
* No change
---
include/types/server.h | 31 +++++++++++++++++++------------
src/cfgparse.c | 15 ++++++++-------
src/checks.c | 12 ++++++------
src/ssl_sock.c | 2 +-
4 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/include/types/server.h b/include/types/server.h
index e70ad8f..1befae6 100644
--- a/include/types/server.h
+++ b/include/types/server.h
@@ -103,6 +103,21 @@ struct tree_occ {
struct eb32_node node;
};
+struct check {
+ struct connection *conn; /* connection state for health
checks */
+
+ short port; /* the port to use for the
health checks */
+ struct buffer *bi, *bo; /* input and output buffers to
send/recv check */
+ struct task *task; /* the task associated to the
health check processing, NULL if disabled */
+ struct timeval start; /* last health check start time
*/
+ long duration; /* time in ms took to finish
last health check */
+ short status, code; /* check result, check code */
+ char desc[HCHK_DESC_LEN]; /* health check descritpion */
+ int use_ssl; /* use SSL for health checks */
+ int send_proxy; /* send a PROXY protocol header
with checks */
+ struct server *server; /* back-pointer to server */
+};
+
struct server {
enum obj_type obj_type; /* object type ==
OBJ_TYPE_SERVER */
struct server *next;
@@ -163,21 +178,13 @@ struct server {
int puid; /* proxy-unique server ID, used
for SNMP, and "first" LB algo */
- struct { /* health-check specific
configuration */
- struct connection *conn; /* connection state for health
checks */
+ struct { /* configuration used by
halth-check and agent-check */
struct protocol *proto; /* server address protocol for
health checks */
struct xprt_ops *xprt; /* transport layer operations
for health checks */
struct sockaddr_storage addr; /* the address to check, if
different from <addr> */
- short port; /* the port to use for the
health checks */
- struct buffer *bi, *bo; /* input and output buffers to
send/recv check */
- struct task *task; /* the task associated to the
health check processing, NULL if disabled */
- struct timeval start; /* last health check start time
*/
- long duration; /* time in ms took to finish
last health check */
- short status, code; /* check result, check code */
- char desc[HCHK_DESC_LEN]; /* health check descritpion */
- int use_ssl; /* use SSL for health checks */
- int send_proxy; /* send a PROXY protocol header
with checks */
- } check;
+ } check_common;
+
+ struct check check; /* health-check specific
configuration */
#ifdef USE_OPENSSL
int use_ssl; /* ssl enabled */
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 41c1949..fc0b34a 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -4199,8 +4199,8 @@ stats_error_parsing:
}
newsrv->addr = *sk;
- newsrv->proto = newsrv->check.proto =
protocol_by_family(newsrv->addr.ss_family);
- newsrv->xprt = newsrv->check.xprt = &raw_sock;
+ newsrv->proto = newsrv->check_common.proto =
protocol_by_family(newsrv->addr.ss_family);
+ newsrv->xprt = newsrv->check_common.xprt = &raw_sock;
if (!newsrv->proto) {
Alert("parsing [%s:%d] : Unknown protocol
family %d '%s'\n",
@@ -4209,7 +4209,7 @@ stats_error_parsing:
goto out;
}
- newsrv->check.use_ssl =
curproxy->defsrv.check.use_ssl;
+ newsrv->check.use_ssl = curproxy->defsrv.check.use_ssl;
newsrv->check.port = curproxy->defsrv.check.port;
newsrv->inter = curproxy->defsrv.inter;
newsrv->fastinter = curproxy->defsrv.fastinter;
@@ -4366,7 +4366,7 @@ stats_error_parsing:
goto out;
}
- newsrv->check.addr = *sk;
+ newsrv->check_common.addr = *sk;
cur_arg += 2;
}
else if (!strcmp(args[cur_arg], "port")) {
@@ -4802,15 +4802,15 @@ stats_error_parsing:
* same as for the production traffic. Otherwise we use
raw_sock by
* default, unless one is specified.
*/
- if (!newsrv->check.port &&
!is_addr(&newsrv->check.addr)) {
+ if (!newsrv->check.port &&
!is_addr(&newsrv->check_common.addr)) {
#ifdef USE_OPENSSL
newsrv->check.use_ssl |= newsrv->use_ssl;
#endif
newsrv->check.send_proxy |= (newsrv->state &
SRV_SEND_PROXY);
}
- /* try to get the port from check.addr if check.port
not set */
+ /* try to get the port from check_core.addr if
check.port not set */
if (!newsrv->check.port)
- newsrv->check.port =
get_host_port(&newsrv->check.addr);
+ newsrv->check.port =
get_host_port(&newsrv->check_common.addr);
if (!newsrv->check.port)
newsrv->check.port = realport; /* by default */
@@ -4860,6 +4860,7 @@ stats_error_parsing:
newsrv->check.conn->t.sock.fd = -1; /* no check in
progress yet */
newsrv->check.status = HCHK_STATUS_INI;
+ newsrv->check.server = newsrv;
newsrv->state |= SRV_CHECKED;
}
diff --git a/src/checks.c b/src/checks.c
index 315ef7a..ca0d404 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -1351,14 +1351,14 @@ static struct task *process_chk(struct task *t)
conn->flags = CO_FL_NONE;
conn->err_code = CO_ER_NONE;
conn->target = &s->obj_type;
- conn_prepare(conn, &check_conn_cb, s->check.proto,
s->check.xprt, s);
+ conn_prepare(conn, &check_conn_cb, s->check_common.proto,
s->check_common.xprt, s);
/* no client address */
clear_addr(&conn->addr.from);
- if (is_addr(&s->check.addr))
+ if (is_addr(&s->check_common.addr))
/* we'll connect to the check addr specified on the
server */
- conn->addr.to = s->check.addr;
+ conn->addr.to = s->check_common.addr;
else
/* we'll connect to the addr on the server */
conn->addr.to = s->addr;
@@ -1377,9 +1377,9 @@ static struct task *process_chk(struct task *t)
* connect() when a pure TCP check is used (without PROXY
protocol).
*/
ret = SN_ERR_INTERNAL;
- if (s->check.proto->connect)
- ret = s->check.proto->connect(conn, s->proxy->options2
& PR_O2_CHK_ANY,
- s->check.send_proxy ? 1 :
(s->proxy->options2 & PR_O2_CHK_ANY) ? 0 : 2);
+ if (s->check_common.proto->connect)
+ ret = s->check_common.proto->connect(conn,
s->proxy->options2 & PR_O2_CHK_ANY,
+
s->check.send_proxy ? 1 : (s->proxy->options2 & PR_O2_CHK_ANY) ? 0 : 2);
conn->flags |= CO_FL_WAKE_DATA;
if (s->check.send_proxy)
conn->flags |= CO_FL_LOCAL_SPROXY;
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 8169d78..97c529e 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -793,7 +793,7 @@ int ssl_sock_prepare_srv_ctx(struct server *srv, struct
proxy *curproxy)
if (srv->use_ssl)
srv->xprt = &ssl_sock;
if (srv->check.use_ssl)
- srv->check.xprt = &ssl_sock;
+ srv->check_common.xprt = &ssl_sock;
srv->ssl_ctx.ctx = SSL_CTX_new(SSLv23_client_method());
if (!srv->ssl_ctx.ctx) {
--
1.8.3.2
