From a6ecc3866cf62c8cc12d8ceb82f169073731fce9 Mon Sep 17 00:00:00 2001 From: Kobi Samoray Date: Tue, 24 Jan 2017 03:49:43 +0200 Subject: [PATCH] NSXv: Do not lock RPC filter update This results a deadlock Change-Id: Ib68a251a768da299aa874e267fcf60faf9454241 --- .../plugins/nsx_v/drivers/distributed_router_driver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vmware_nsx/plugins/nsx_v/drivers/distributed_router_driver.py b/vmware_nsx/plugins/nsx_v/drivers/distributed_router_driver.py index 88cf588f89..8469705ea3 100644 --- a/vmware_nsx/plugins/nsx_v/drivers/distributed_router_driver.py +++ b/vmware_nsx/plugins/nsx_v/drivers/distributed_router_driver.py @@ -461,11 +461,11 @@ class RouterDistributedDriver(router_driver.RouterBaseDriver): # inconsistency. We check for this anyway, in case that # something is broken. 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( 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( context, network_id, vdr_dhcp_binding['dhcp_edge_id']) else: