x/vmware-nsx
Code Issues Proposed changes

NSXv: Do not lock RPC filter update

Browse Source 
This results a deadlock

Change-Id: Ib68a251a768da299aa874e267fcf60faf9454241
This commit is contained in:
Kobi Samoray 2017-01-24 03:49:43 +02:00
parent df95b51df3
commit a6ecc3866c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vmware_nsx/plugins/nsx_v/drivers/distributed_router_driver.py
View File

@ -461,11 +461,11 @@ class RouterDistributedDriver(router_driver.RouterBaseDriver):
# inconsistency. We check for this anyway, in case that # inconsistency. We check for this anyway, in case that
# something is broken. # something is broken.
if vdr_dhcp_binding: if vdr_dhcp_binding:
self.edge_manager.reset_sysctl_rp_filter_for_vdr_dhcp(
context, vdr_dhcp_binding['dhcp_edge_id'], network_id)
with locking.LockManager.get_lock( with locking.LockManager.get_lock(
vdr_dhcp_binding['dhcp_edge_id']): vdr_dhcp_binding['dhcp_edge_id']):
self.edge_manager.reset_sysctl_rp_filter_for_vdr_dhcp(
context, vdr_dhcp_binding['dhcp_edge_id'], network_id)
self.edge_manager.remove_network_from_dhcp_edge( self.edge_manager.remove_network_from_dhcp_edge(
context, network_id, vdr_dhcp_binding['dhcp_edge_id']) context, network_id, vdr_dhcp_binding['dhcp_edge_id'])
else: else: