x/vmware-nsx
Code Issues Proposed changes

Merge "L3 RPC loop could delete a router on concurrent update"

Browse Source
This commit is contained in:
Jenkins 2014-05-07 15:32:39 +00:00 committed by Gerrit Code Review
commit cc7f45e613
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
neutron/agent/l3_agent.py
View File

@ -793,18 +793,24 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback, manager.Manager):
# _rpc_loop and _sync_routers_task will not be # _rpc_loop and _sync_routers_task will not be
# executed in the same time because of lock. # executed in the same time because of lock.
# so we can clear the value of updated_routers # so we can clear the value of updated_routers
# and removed_routers # and removed_routers, but they can be updated by
# updated_routers and removed_routers rpc call
try: try:
LOG.debug(_("Starting RPC loop for %d updated routers"), LOG.debug(_("Starting RPC loop for %d updated routers"),
len(self.updated_routers)) len(self.updated_routers))
if self.updated_routers: if self.updated_routers:
router_ids = list(self.updated_routers) # We're capturing and clearing the list, and will
# process the "captured" updates in this loop,
# and any updates that happen due to a context switch
# will be picked up on the next pass.
updated_routers = set(self.updated_routers)
self.updated_routers.clear()
router_ids = list(updated_routers)
routers = self.plugin_rpc.get_routers( routers = self.plugin_rpc.get_routers(
self.context, router_ids) self.context, router_ids)
# routers with admin_state_up=false will not be in the fetched
fetched = set([r['id'] for r in routers]) fetched = set([r['id'] for r in routers])
self.removed_routers.update(self.updated_routers - fetched) self.removed_routers.update(updated_routers - fetched)
self.updated_routers.clear()
self._process_routers(routers) self._process_routers(routers)
self._process_router_delete() self._process_router_delete()