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

48
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,32 +83,34 @@ 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):
if not self.set_name_exists(set_name): with lockutils.lock('neutron-ipset-%s' % self.namespace,
# The initial creation is handled with create/refresh to external=True):
# avoid any downtime for existing sets (i.e. avoiding if not self.set_name_exists(set_name):
# a flush/restore), as the restore operation of ipset is # The initial creation is handled with create/refresh to
# additive to the existing set. # avoid any downtime for existing sets (i.e. avoiding
self._create_set(set_name, ethertype) # a flush/restore), as the restore operation of ipset is
self._refresh_set(set_name, member_ips, ethertype) # additive to the existing set.
# TODO(majopela,shihanzhang,haleyb): Optimize this by self._create_set(set_name, ethertype)
# gathering the system ipsets at start. So we can determine
# if a normal restore is enough for initial creation.
# That should speed up agent boot up time.
else:
add_ips = self._get_new_set_ips(set_name, member_ips)
del_ips = self._get_deleted_set_ips(set_name, member_ips)
if (len(add_ips) + len(del_ips) < IPSET_ADD_BULK_THRESHOLD):
self._add_members_to_set(set_name, add_ips)
self._del_members_from_set(set_name, del_ips)
else:
self._refresh_set(set_name, member_ips, ethertype) self._refresh_set(set_name, member_ips, ethertype)
# TODO(majopela,shihanzhang,haleyb): Optimize this by
# gathering the system ipsets at start. So we can determine
# if a normal restore is enough for initial creation.
# That should speed up agent boot up time.
else:
add_ips = self._get_new_set_ips(set_name, member_ips)
del_ips = self._get_deleted_set_ips(set_name, member_ips)
if (len(add_ips) + len(del_ips) < IPSET_ADD_BULK_THRESHOLD):
self._add_members_to_set(set_name, add_ips)
self._del_members_from_set(set_name, del_ips)
else:
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):
set_name = self.get_name(id, ethertype) with lockutils.lock('neutron-ipset-%s' % self.namespace,
self._destroy(set_name, forced) external=True):
set_name = self.get_name(id, ethertype)
self._destroy(set_name, forced)
def _add_member_to_set(self, set_name, member_ip): def _add_member_to_set(self, set_name, member_ip):
cmd = ['ipset', 'add', '-exist', set_name, member_ip] cmd = ['ipset', 'add', '-exist', set_name, member_ip]