openstack/deb-designate
Code Issues Proposed changes

Merge "Fixed timeout variable scope issues"

Browse Source
This commit is contained in:
Jenkins 2015-07-28 15:15:23 +00:00 committed by Gerrit Code Review
commit 95787fe068
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
designate/dnsutils.py
View File

@ -311,20 +311,22 @@ def do_axfr(zone_name, servers, timeout=None, source=None):
Performs an AXFR for a given zone name Performs an AXFR for a given zone name
""" """
random.shuffle(servers) random.shuffle(servers)
timeout = timeout or 10 timeout = timeout or cfg.CONF["service:mdns"].xfr_timeout
xfr = None xfr = None
for srv in servers: for srv in servers:
timeout = eventlet.Timeout(timeout) to = eventlet.Timeout(timeout)
log_info = {'name': zone_name, 'host': srv} log_info = {'name': zone_name, 'host': srv}
try: try:
LOG.info(_LI("Doing AXFR for %(name)s from %(host)s") % log_info) LOG.info(_LI("Doing AXFR for %(name)s from %(host)s") % log_info)
xfr = dns.query.xfr(srv['ip'], zone_name, relativize=False, xfr = dns.query.xfr(srv['ip'], zone_name, relativize=False,
timeout=1, port=srv['port'], source=source) timeout=1, port=srv['port'], source=source)
raw_zone = dns.zone.from_xfr(xfr, relativize=False) raw_zone = dns.zone.from_xfr(xfr, relativize=False)
break break
except eventlet.Timeout as t: except eventlet.Timeout as t:
if t == timeout: if t == to:
msg = _LE("AXFR timed out for %(name)s from %(host)s") msg = _LE("AXFR timed out for %(name)s from %(host)s")
LOG.error(msg % log_info) LOG.error(msg % log_info)
continue continue
@ -341,7 +343,7 @@ def do_axfr(zone_name, servers, timeout=None, source=None):
"Trying next server.") "Trying next server.")
LOG.exception(msg % log_info) LOG.exception(msg % log_info)
finally: finally:
timeout.cancel() to.cancel()
continue continue
else: else:
msg = _LE("XFR failed for %(name)s. No servers in %(servers)s was " msg = _LE("XFR failed for %(name)s. No servers in %(servers)s was "