openstack
/
designate
Code Issues Proposed changes

Merge "Switch get_serial_number logging to debug"

This commit is contained in:
Jenkins 2016-03-16 12:57:53 +00:00 committed by Gerrit Code Review
parent 6aa4308803 ac8035387e
commit a4c3fc59f5
2 changed files with 49 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
designate/mdns/notify.py
View File

@ -113,18 +113,19 @@ class NotifyEndpoint(base.BaseEndpoint):
"""
actual_serial = None
status = 'ERROR'
retries = max_retries
retries_left = max_retries
time.sleep(delay)
while (True):
(response, retry) = self._make_and_send_dns_message(
zone, host, port, timeout, retry_interval, retries)
while True:
response, retry_cnt = self._make_and_send_dns_message(
zone, host, port, timeout, retry_interval, retries_left)
if response and (response.rcode() in (
dns.rcode.NXDOMAIN, dns.rcode.REFUSED, dns.rcode.SERVFAIL)
or not bool(response.answer)):
status = 'NO_ZONE'
if zone.serial == 0 and zone.action in ['DELETE', 'NONE']:
return (status, 0, retries)
if zone.serial == 0 and zone.action in ('DELETE', 'NONE'):
actual_serial = 0
break # Zone not expected to exist
elif response and len(response.answer) == 1 \
and str(response.answer[0].name) == str(zone.name) \
@ -134,30 +135,33 @@ class NotifyEndpoint(base.BaseEndpoint):
rrset = response.answer[0]
actual_serial = rrset.to_rdataset().items[0].serial
if actual_serial is None or actual_serial < zone.serial:
# TODO(vinod): Account for serial number wrap around.
retries = retries - retry
LOG.warning(_LW("Got lower serial for '%(zone)s' to '%(host)s:"
"%(port)s'. Expected:'%(es)d'. Got:'%(as)s'."
"Retries left='%(retries)d'") %
{'zone': zone.name, 'host': host,
'port': port, 'es': zone.serial,
'as': actual_serial, 'retries': retries})
if retries > 0:
# retry again
time.sleep(retry_interval)
continue
else:
break
else:
# TODO(vinod): Account for serial number wrap around. Unix
# timestamps are used where Designate is primary, but secondary
# zones use different values.
if actual_serial is not None and actual_serial >= zone.serial:
# Everything looks good at this point. Return SUCCESS.
status = 'SUCCESS'
break
# Return retries for testing purposes.
return (status, actual_serial, retries)
retries_left -= retry_cnt
msg = _LW("Got lower serial for '%(zone)s' to '%(host)s:"
"%(port)s'. Expected:'%(es)d'. Got:'%(as)s'."
"Retries left='%(retries)d'") % {
'zone': zone.name, 'host': host, 'port': port,
'es': zone.serial, 'as': actual_serial,
'retries': retries_left}
if not retries_left:
# return with error
LOG.warning(msg)
break
LOG.debug(msg)
# retry again
time.sleep(retry_interval)
# Return retries_left for testing purposes.
return status, actual_serial, retries_left
def _make_and_send_dns_message(self, zone, host, port, timeout,
retry_interval, max_retries, notify=False):

19
designate/tests/unit/test_mdns/test_notify.py
View File

@ -65,6 +65,7 @@ class MdnsNotifyTest(base.BaseTestCase):
'c', 'z', ns, 'status', 99)
def test_get_serial_number_nxdomain(self, *mocks):
# The zone is not found but it was supposed to be there
response = RoObject(
answer=[RoObject(
rdclass=dns.rdataclass.IN,
@ -81,6 +82,24 @@ class MdnsNotifyTest(base.BaseTestCase):
self.assertEqual(('NO_ZONE', None, 0), out)
def test_get_serial_number_nxdomain_deleted_zone(self, *mocks):
# The zone is not found and it's not was supposed be there
response = RoObject(
answer=[RoObject(
rdclass=dns.rdataclass.IN,
rdtype=dns.rdatatype.SOA
)],
rcode=Mock(return_value=dns.rcode.NXDOMAIN)
)
zone = RoObject(name='zn', serial=0, action='DELETE')
self.notify._make_and_send_dns_message = Mock(
return_value=(response, 1)
)
out = self.notify.get_serial_number('c', zone, 'h', 1234, 1, 2, 3, 4)
self.assertEqual(('NO_ZONE', 0, 3), out)
def test_get_serial_number_ok(self, *mocks):
zone = RoObject(name='zn', serial=314)
ds = RoObject(items=[zone])