x/vmware-nsx
Code Issues Proposed changes

Merge "Tighten up try/except block around rpc call"

Browse Source
This commit is contained in:
Jenkins
2014-11-28 22:21:19 +00:00
committed by Gerrit Code Review
parent 00ddf539fc 2f4e7b53a3
commit e0a66cdca7
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
neutron/agent/l3_agent.py
View File

@@ -1845,15 +1845,22 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback,
if self._clean_stale_namespaces: if self._clean_stale_namespaces:
namespaces = self._list_namespaces() namespaces = self._list_namespaces()
prev_router_ids = set(self.router_info) prev_router_ids = set(self.router_info)
timestamp = timeutils.utcnow()
try: try:
timestamp = timeutils.utcnow()
if self.conf.use_namespaces: if self.conf.use_namespaces:
routers = self.plugin_rpc.get_routers(context) routers = self.plugin_rpc.get_routers(context)
else: else:
routers = self.plugin_rpc.get_routers(context, routers = self.plugin_rpc.get_routers(context,
[self.conf.router_id]) [self.conf.router_id])
except messaging.MessagingException:
LOG.exception(_LE("Failed synchronizing routers due to RPC error"))
self.fullsync = True
except Exception:
LOG.exception(_LE("Failed synchronizing routers"))
self.fullsync = True
else:
LOG.debug('Processing :%r', routers) LOG.debug('Processing :%r', routers)
for r in routers: for r in routers:
update = RouterUpdate(r['id'], update = RouterUpdate(r['id'],
@@ -1863,13 +1870,7 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback,
self._queue.add(update) self._queue.add(update)
self.fullsync = False self.fullsync = False
LOG.debug("periodic_sync_routers_task successfully completed") LOG.debug("periodic_sync_routers_task successfully completed")
except messaging.MessagingException:
LOG.exception(_LE("Failed synchronizing routers due to RPC error"))
self.fullsync = True
except Exception:
LOG.exception(_LE("Failed synchronizing routers"))
self.fullsync = True
else:
# Resync is not necessary for the cleanup of stale namespaces # Resync is not necessary for the cleanup of stale namespaces
curr_router_ids = set([r['id'] for r in routers]) curr_router_ids = set([r['id'] for r in routers])