x/vmware-nsx
Code Issues Proposed changes

NSX|v: lock shared routers interface actions

Browse Source 
Adding/removing a shared router interface can change is edge deployment,
and should be locked since 2 of those actions together may use differnet edges.
Other actions that an impact the deployment are under update_router
which already uses the same lock.

Change-Id: Iac802c49dbd37792c8376e849511626bf46755e3
This commit is contained in:
Adit Sarfaty 2017-08-02 10:23:28 +03:00
parent 3d89d25667
commit ff505e03e9
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vmware_nsx/plugins/nsx_v/drivers/shared_router_driver.py
View File

@ -760,6 +760,13 @@ class RouterSharedDriver(router_driver.RouterBaseDriver):
context, router_id, interface_info)
def add_router_interface(self, context, router_id, interface_info):
# Lock the shared router before any action that can cause the router
# to be deployed on a new edge.
with locking.LockManager.get_lock('router-%s' % router_id):
return self._safe_add_router_interface(context, router_id,
interface_info)
def _safe_add_router_interface(self, context, router_id, interface_info):
self.plugin._check_intf_number_of_router(context, router_id)
edge_id = edge_utils.get_router_edge_id(context, router_id)
router_db = self.plugin._get_router(context, router_id)
@ -850,6 +857,14 @@ class RouterSharedDriver(router_driver.RouterBaseDriver):
return info
def remove_router_interface(self, context, router_id, interface_info):
# Lock the shared router before any action that can cause the router
# to be deployed on a new edge
with locking.LockManager.get_lock('router-%s' % router_id):
return self._safe_remove_router_interface(context, router_id,
interface_info)
def _safe_remove_router_interface(self, context, router_id,
interface_info):
edge_id = edge_utils.get_router_edge_id(context, router_id)
with locking.LockManager.get_lock('nsx-shared-router-pool'):
info = super(