From: Baptiste Assmann <bedis9@gmail.com>
Date: Tue, 4 Aug 2020 08:57:21 +0000 (+0200)
Subject: BUG/MAJOR: dns: disabled servers through SRV records never recover
X-Git-Tag: v2.3-dev3~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87138c3524bc4242dc48cfacba82d34504958e78;p=thirdparty%2Fhaproxy.git

BUG/MAJOR: dns: disabled servers through SRV records never recover

A regression was introduced by 13a9232ebc63fdf357ffcf4fa7a1a5e77a1eac2b
when I added support for Additional section of the SRV responses..

Basically, when a server is managed through SRV records additional
section and it's disabled (because its associated Additional record has
disappeared), it never leaves its MAINT state and so never comes back to
production.
This patch updates the "snr_update_srv_status()" function to clear the
MAINT status when the server now has an IP address and also ensure this
function is called when parsing Additional records (and associating them
to new servers).

This can cause severe outage for people using HAProxy + consul (or any
other service registry) through DNS service discovery).

This should fix issue #793.
This should be backported to 2.2.
---

diff --git a/src/dns.c b/src/dns.c
index c97c7dc69b..333780293a 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -648,6 +648,9 @@ static void dns_check_dns_response(struct dns_resolution *res)
 				if (msg)
 					send_log(srv->proxy, LOG_NOTICE, "%s", msg);
 
+				/* now we have an IP address associated to this server, we can update its status */
+				snr_update_srv_status(srv, 0);
+
 				srv->svc_port = item->port;
 				srv->flags   &= ~SRV_F_MAPPORTS;
 				if ((srv->check.state & CHK_ST_CONFIGURED) &&
diff --git a/src/server.c b/src/server.c
index 918294b2f4..3f26104ccf 100644
--- a/src/server.c
+++ b/src/server.c
@@ -3733,6 +3733,12 @@ int snr_update_srv_status(struct server *s, int has_no_ip)
 
 	/* If resolution is NULL we're dealing with SRV records Additional records */
 	if (resolution == NULL) {
+		/* since this server has an IP, it can go back in production */
+		if (has_no_ip == 0) {
+			srv_clr_admin_flag(s, SRV_ADMF_RMAINT);
+			return 1;
+		}
+
 		if (s->next_admin & SRV_ADMF_RMAINT)
 			return 1;