Ema has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/364948 )

Change subject: DnsQuery monitor: query over IPv4
......................................................................


DnsQuery monitor: query over IPv4

Fallback to using the DNS server IPv4 addresses instead of
self.server.ip as querying DNS servers using IPv6 addresses is not
supported by Twisted's DNS client before Twisted 17.1.0.

Bug: T82747
Ref: https://github.com/twisted/twisted/blob/trunk/NEWS.rst#bugfixes-5
Change-Id: I120e7983095a7e174b9b64ca97ca2e46061045e6
---
M pybal/monitors/dnsquery.py
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, but someone else must approve
  Ema: Verified; Looks good to me, approved



diff --git a/pybal/monitors/dnsquery.py b/pybal/monitors/dnsquery.py
index b374791..32c7a2a 100644
--- a/pybal/monitors/dnsquery.py
+++ b/pybal/monitors/dnsquery.py
@@ -51,8 +51,10 @@
 
         super(DNSQueryMonitoringProtocol, self).run()
 
-        # Create a resolver
-        self.resolver = client.createResolver([(self.server.ip, 53)])
+        # Create a resolver. Use the DNS server IPv4 addresses instead of
+        # self.server.ip as Twisted's createResolver (< 17.1.0) does not
+        # support querying a nameserver over IPv6.
+        self.resolver = client.createResolver([(ip, 53) for ip in 
self.server.ip4_addresses])
 
         if not self.checkCall or not self.checkCall.active():
             self.checkCall = reactor.callLater(self.intvCheck, self.check)

-- 
To view, visit https://gerrit.wikimedia.org/r/364948
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I120e7983095a7e174b9b64ca97ca2e46061045e6
Gerrit-PatchSet: 4
Gerrit-Project: operations/debs/pybal
Gerrit-Branch: master
Gerrit-Owner: Ema <e...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Ema <e...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to