openstack/neutron
Code Issues Proposed changes

Merge "Change exception messages to error log messages for DNS integration."

Browse Source
This commit is contained in:
Zuul 2024-04-10 23:53:01 +00:00 committed by Gerrit Code Review
commit 031aad583d
3 changed files with 52 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
neutron/db/dns_db.py
View File

@ -213,15 +213,18 @@ class DNSDbMixin(object):
try:
self.dns_driver.delete_record_set(context, dns_domain, dns_name,
ips)
except (dns_exc.DNSDomainNotFound, dns_exc.DuplicateRecordSet) as e:
LOG.exception("Error deleting Floating IP data from external "
"DNS service. Name: '%(name)s'. Domain: "
"'%(domain)s'. IP addresses '%(ips)s'. DNS "
"service driver message '%(message)s'",
{"name": dns_name,
"domain": dns_domain,
"message": e.msg,
"ips": ', '.join(ips)})
except dns_exc.DNSDomainNotFound:
LOG.error("Error deleting Floating IP record %(name)s from "
"external DNS service. The DNS domain %(domain)s was "
"not found.",
{"name": dns_name,
"domain": dns_domain})
except dns_exc.DuplicateRecordSet:
LOG.error("Error deleting Floating IP record from external DNS "
"service. Duplicate Floating IP records for %(name)s in "
"domain %(domain)s were found.",
{"name": dns_name,
"domain": dns_domain})
def _get_requested_state_for_external_dns_service_create(self, context,
floatingip_data,
@ -245,11 +248,15 @@ class DNSDbMixin(object):
try:
self.dns_driver.create_record_set(context, dns_domain, dns_name,
ips)
except (dns_exc.DNSDomainNotFound, dns_exc.DuplicateRecordSet) as e:
LOG.exception("Error publishing floating IP data in external "
"DNS service. Name: '%(name)s'. Domain: "
"'%(domain)s'. DNS service driver message "
"'%(message)s'",
{"name": dns_name,
"domain": dns_domain,
"message": e.msg})
except dns_exc.DNSDomainNotFound:
LOG.error("The DNS domain %(domain)s was not found. Creation of "
"Floating IP record %(name)s from external DNS service "
"will be skipped.",
{"name": dns_name,
"domain": dns_domain})
except dns_exc.DuplicateRecordSet:
LOG.error("A Floating IP record for %(name)s in domain %(domain)s "
"already exists. record creation in external DNS "
"service will be skipped.",
{"name": dns_name,
"domain": dns_domain})

38
neutron/plugins/ml2/extensions/dns_integration.py
View File

@ -487,28 +487,34 @@ def _send_data_to_external_dns_service(context, dns_driver, dns_domain,
dns_name, records):
try:
dns_driver.create_record_set(context, dns_domain, dns_name, records)
except (dns_exc.DNSDomainNotFound, dns_exc.DuplicateRecordSet) as e:
LOG.exception("Error publishing port data in external DNS "
"service. Name: '%(name)s'. Domain: '%(domain)s'. "
"DNS service driver message '%(message)s'",
{"name": dns_name,
"domain": dns_domain,
"message": e.msg})
except dns_exc.DNSDomainNotFound:
LOG.error("Error publishing port data. The DNS domain %(domain)s "
"was not found, creation of recordset %(name)s in "
"external DNS service will be skipped.",
{"name": dns_name,
"domain": dns_domain})
except dns_exc.DuplicateRecordSet:
LOG.error("Error publishing port data. A recordset for %(name)s in "
"domain %(domain)s already exists, recordset creation in "
"external DNS service will be skipped.",
{"name": dns_name,
"domain": dns_domain})
def _remove_data_from_external_dns_service(context, dns_driver, dns_domain,
dns_name, records):
try:
dns_driver.delete_record_set(context, dns_domain, dns_name, records)
except (dns_exc.DNSDomainNotFound, dns_exc.DuplicateRecordSet) as e:
LOG.exception("Error deleting port data from external DNS "
"service. Name: '%(name)s'. Domain: '%(domain)s'. "
"IP addresses '%(ips)s'. DNS service driver message "
"'%(message)s'",
{"name": dns_name,
"domain": dns_domain,
"message": e.msg,
"ips": ', '.join(records)})
except dns_exc.DNSDomainNotFound:
LOG.error("Error deleting port data from external DNS service. "
"The DNS domain %(domain)s was not found.",
{"domain": dns_domain})
except dns_exc.DuplicateRecordSet:
LOG.error("Error deleting port data from external DNS service. "
"Duplicate recordsets for %(name)s in domain %(domain)s "
"were found.",
{"name": dns_name,
"domain": dns_domain})
def _update_port_in_external_dns_service(resource, event, trigger, payload):

6
releasenotes/notes/change-dns-integration-logging-from-exception-to-error-7927d91f915046c3.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Cleaned non-harmful stack trace errors from DNS integration plugin. This
prevents the logs from filling with stack traces where error log messages
would have been sufficient.