openstack/monasca-notification
Code Issues Proposed changes

Fix notification type plugin install loop

Browse Source 
The 'insert_configured_plugins' function occasionally gets into an infinite loop.
This patch ensures the loop fails properly after max_retries is met.

Story: 2005540
Task: 30680
Change-Id: I99d7750fac6d0355d182df1612c6a5abbbad7fc6
This commit is contained in:
Isaac Prior 2019-06-07 15:27:56 +01:00
parent f708d32bf1
commit df2f1ef228
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
monasca_notification/processors/notification_processor.py
View File

@ -48,21 +48,27 @@ class NotificationProcessor(object):
remaining_plugin_types = self._remaining_plugin_types()
max_retry = len(remaining_plugin_types)
retry_count = 0
while remaining_plugin_types:
retry_count = retry_count + 1
for attempt in range(max_retry):
try:
log.info("New plugins detected: Adding new notification types %s to database",
remaining_plugin_types)
self._db_repo.insert_notification_method_types(remaining_plugin_types)
remaining_plugin_types = self._remaining_plugin_types()
if not remaining_plugin_types:
log.info("Notification type plugins installed")
return
except exc.DatabaseException as e:
# There is a possibility the other process has already registered the type.
remaining_plugin_types = self._remaining_plugin_types()
if remaining_plugin_types and (retry_count >= max_retry):
log.exception("Couldn't insert notification types %s", e)
raise e
else:
if not remaining_plugin_types:
log.debug("Plugin already exists. Ignore exception")
log.info("Notification type plugins installed")
return
else:
log.exception("Couldn't insert notification types %s", e)
if attempt == max_retry - 1:
log.exception("Max retries exceeded installing notification types %s", e)
raise e
def send(self, notifications):
"""Send the notifications