openstack/neutron
Code Issues Proposed changes

Merge "Parametrize ipset locking with network namespace"

Browse Source
This commit is contained in:
Zuul
2019-04-25 12:03:59 +00:00
committed by Gerrit Code Review
parent fb518b1cb9 2e6f6bf759
commit 3a387051db
1 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/agent/linux/ipset_manager.py
View File

@@ -14,9 +14,9 @@
import copy import copy
import netaddr import netaddr
from neutron_lib.utils import runtime
from neutron.agent.linux import utils as linux_utils from neutron.agent.linux import utils as linux_utils
from oslo_concurrency import lockutils
IPSET_ADD_BULK_THRESHOLD = 5 IPSET_ADD_BULK_THRESHOLD = 5
NET_PREFIX = 'N' NET_PREFIX = 'N'
@@ -83,8 +83,9 @@ class IpsetManager(object):
self.set_members_mutate(set_name, ethertype, member_ips) self.set_members_mutate(set_name, ethertype, member_ips)
return add_ips, del_ips return add_ips, del_ips
@runtime.synchronized('ipset', external=True)
def set_members_mutate(self, set_name, ethertype, member_ips): def set_members_mutate(self, set_name, ethertype, member_ips):
with lockutils.lock('neutron-ipset-%s' % self.namespace,
external=True):
if not self.set_name_exists(set_name): if not self.set_name_exists(set_name):
# The initial creation is handled with create/refresh to # The initial creation is handled with create/refresh to
# avoid any downtime for existing sets (i.e. avoiding # avoid any downtime for existing sets (i.e. avoiding
@@ -105,8 +106,9 @@ class IpsetManager(object):
else: else:
self._refresh_set(set_name, member_ips, ethertype) self._refresh_set(set_name, member_ips, ethertype)
@runtime.synchronized('ipset', external=True)
def destroy(self, id, ethertype, forced=False): def destroy(self, id, ethertype, forced=False):
with lockutils.lock('neutron-ipset-%s' % self.namespace,
external=True):
set_name = self.get_name(id, ethertype) set_name = self.get_name(id, ethertype)
self._destroy(set_name, forced) self._destroy(set_name, forced)