openstack/kuryr
Code Issues Proposed changes

Make use of one instance of IPDB

Browse Source 
Creating an instance of IPDB for each use of binding, has a
significant impact on the scalability of Kuryr. As the number of
containers on a host increases, the cost of attaching a container to a
network increases rapidly. This patch, fixes the problem.

Change-Id: Id7dff9348acd36481146e4edfba8f92cff040ced
Closes-Bug: #1539252
This commit is contained in:
Mohammad Banikazemi 2016-02-15 12:16:28 -05:00
parent a35f137a58
commit 811de8e9ab
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kuryr/binding.py
View File

@ -35,6 +35,9 @@ UNBINDING_SUBCOMMAND = 'unbind'
VETH_POSTFIX = '-veth' VETH_POSTFIX = '-veth'
VIF_TYPE_KEY = 'binding:vif_type' VIF_TYPE_KEY = 'binding:vif_type'
ip = pyroute2.IPDB()
ipr = pyroute2.IPRoute()
def _is_up(interface): def _is_up(interface):
flags = interface['flags'] flags = interface['flags']
@ -51,7 +54,8 @@ def cleanup_veth(ifname):
exists, otherwise None exists, otherwise None
:raises: pyroute2.netlink.NetlinkError :raises: pyroute2.netlink.NetlinkError
""" """
ipr = pyroute2.IPRoute() global ipr
veths = ipr.link_lookup(ifname=ifname) veths = ipr.link_lookup(ifname=ifname)
if veths: if veths:
host_veth_index = veths[0] host_veth_index = veths[0]
@ -75,15 +79,12 @@ def port_bind(endpoint_id, neutron_port, neutron_subnets):
:raises: kuryr.common.exceptions.VethCreationFailure, :raises: kuryr.common.exceptions.VethCreationFailure,
processutils.ProcessExecutionError processutils.ProcessExecutionError
""" """
# NOTE(tfukushima): pyroute2.ipdb requires Linux to be imported. So I don't global ip
# import it in the module scope but here.
import pyroute2.ipdb
ifname = endpoint_id[:8] + VETH_POSTFIX ifname = endpoint_id[:8] + VETH_POSTFIX
peer_name = ifname + CONTAINER_VETH_POSTFIX peer_name = ifname + CONTAINER_VETH_POSTFIX
subnets_dict = {subnet['id']: subnet for subnet in neutron_subnets} subnets_dict = {subnet['id']: subnet for subnet in neutron_subnets}
ip = pyroute2.IPDB()
try: try:
with ip.create(ifname=ifname, kind=KIND_VETH, with ip.create(ifname=ifname, kind=KIND_VETH,
reuse=True, peer=peer_name) as host_veth: reuse=True, peer=peer_name) as host_veth:
@ -108,8 +109,6 @@ def port_bind(endpoint_id, neutron_port, neutron_subnets):
except pyroute2.ipdb.common.CommitException: except pyroute2.ipdb.common.CommitException:
raise exceptions.VethCreationFailure( raise exceptions.VethCreationFailure(
'Could not configure the veth endpoint for the container.') 'Could not configure the veth endpoint for the container.')
finally:
ip.release()
vif_type = neutron_port.get(VIF_TYPE_KEY, FALLBACK_VIF_TYPE) vif_type = neutron_port.get(VIF_TYPE_KEY, FALLBACK_VIF_TYPE)
binding_exec_path = os.path.join(config.CONF.bindir, vif_type) binding_exec_path = os.path.join(config.CONF.bindir, vif_type)
@ -134,9 +133,6 @@ def port_unbind(endpoint_id, neutron_port):
invoked with the executable script for unbinding invoked with the executable script for unbinding
:raises: processutils.ProcessExecutionError, pyroute2.netlink.NetlinkError :raises: processutils.ProcessExecutionError, pyroute2.netlink.NetlinkError
""" """
# NOTE(tfukushima): pyroute2.netlink requires Linux to be imported. So I
# don't import it in the module scope but here.
import pyroute2.netlink
vif_type = neutron_port.get(VIF_TYPE_KEY, FALLBACK_VIF_TYPE) vif_type = neutron_port.get(VIF_TYPE_KEY, FALLBACK_VIF_TYPE)
unbinding_exec_path = os.path.join(config.CONF.bindir, vif_type) unbinding_exec_path = os.path.join(config.CONF.bindir, vif_type)
@ -148,5 +144,5 @@ def port_unbind(endpoint_id, neutron_port):
cleanup_veth(ifname) cleanup_veth(ifname)
except pyroute2.netlink.NetlinkError: except pyroute2.netlink.NetlinkError:
raise exceptions.VethDeleteionFailure( raise exceptions.VethDeleteionFailure(
'Deleting the veth pair was failed.') 'Deleting the veth pair failed.')
return (stdout, stderr) return (stdout, stderr)