[MINOR] acl: add srv_is_up() to check that a specific server is up or not
This ACL was missing in complex setups where the status of a remote site
has to be considered in switching decisions. Until there, using a server's
status in an ACL required to have a dedicated backend, which is a bit heavy
when multiple servers have to be monitored.
diff --git a/src/acl.c b/src/acl.c
index bdd1204..a4c61a0 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -24,6 +24,7 @@
#include <proto/acl.h>
#include <proto/auth.h>
#include <proto/log.h>
+#include <proto/proxy.h>
#include <ebsttree.h>
@@ -1428,6 +1429,53 @@
list_for_each_entry(acl, &p->acl, list) {
list_for_each_entry(expr, &acl->expr, list) {
+ if (strcmp(expr->kw->kw, "srv_is_up") == 0) {
+ struct proxy *px;
+ struct server *srv;
+ char *pname, *sname;
+
+ if (!expr->arg.str || !*expr->arg.str) {
+ Alert("proxy %s: acl %s %s(): missing server name.\n",
+ p->id, acl->name, expr->kw->kw);
+ cfgerr++;
+ continue;
+ }
+
+ pname = expr->arg.str;
+ sname = strrchr(pname, '/');
+
+ if (sname)
+ *sname++ = '\0';
+ else {
+ sname = pname;
+ pname = NULL;
+ }
+
+ px = p;
+ if (pname) {
+ px = findproxy(pname, PR_CAP_BE);
+ if (!px) {
+ Alert("proxy %s: acl %s %s(): unable to find proxy '%s'.\n",
+ p->id, acl->name, expr->kw->kw, pname);
+ cfgerr++;
+ continue;
+ }
+ }
+
+ srv = findserver(px, sname);
+ if (!srv) {
+ Alert("proxy %s: acl %s %s(): unable to find server '%s'.\n",
+ p->id, acl->name, expr->kw->kw, sname);
+ cfgerr++;
+ continue;
+ }
+
+ free(expr->arg.str);
+ expr->arg_len = 0;
+ expr->arg.srv = srv;
+ continue;
+ }
+
if (strstr(expr->kw->kw, "http_auth") == expr->kw->kw) {
if (!expr->arg.str || !*expr->arg.str) {
diff --git a/src/backend.c b/src/backend.c
index ffd3bca..6f1eefe 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -1232,6 +1232,24 @@
return 1;
}
+/* report in test->flags a success or failure depending on the designated
+ * server's state. There is no match function involved since there's no pattern.
+ */
+static int
+acl_fetch_srv_is_up(struct proxy *px, struct session *l4, void *l7, int dir,
+ struct acl_expr *expr, struct acl_test *test)
+{
+ struct server *srv = expr->arg.srv;
+
+ test->flags = ACL_TEST_F_VOL_TEST;
+ if (!(srv->state & SRV_MAINTAIN) &&
+ (!(srv->state & SRV_CHECKED) || (srv->state & SRV_RUNNING)))
+ test->flags |= ACL_TEST_F_SET_RES_PASS;
+ else
+ test->flags |= ACL_TEST_F_SET_RES_FAIL;
+ return 1;
+}
+
/* set test->i to the number of enabled servers on the proxy */
static int
acl_fetch_connslots(struct proxy *px, struct session *l4, void *l7, int dir,
@@ -1410,6 +1428,7 @@
{ "be_conn", acl_parse_int, acl_fetch_be_conn, acl_match_int, ACL_USE_NOTHING },
{ "queue", acl_parse_int, acl_fetch_queue_size, acl_match_int, ACL_USE_NOTHING },
{ "avg_queue", acl_parse_int, acl_fetch_avg_queue_size, acl_match_int, ACL_USE_NOTHING },
+ { "srv_is_up", acl_parse_nothing, acl_fetch_srv_is_up, acl_match_nothing, ACL_USE_NOTHING },
{ NULL, NULL, NULL, NULL },
}};