Browse Source

Exclude fallback tunnel devices from netns cleanup

When a namespace gets created, if the fb_tunnels_only_for_init_net
sysctl configuration is set to 0, the fallback tunnels will be
automatically created if the corresponding tunnel is present
in the initial network namespace. Source [0].

This is being observed in some systems where namespaces are not
getting cleaned up due to the presence of such devices as
ip_lib.namespace_is_empty() is returning False.

This patch is adding such devices as per the kernel documentation
to the list of excluded devices by default.

[0] https://www.kernel.org/doc/Documentation/sysctl/net.txt

Closes-Bug: #1797084
Change-Id: I94415a0da5367e2d98d792a5eb4ba3919b838326
Signed-off-by: Daniel Alvarez <dalvarez@redhat.com>
changes/24/609324/2
Daniel Alvarez 3 years ago
parent
commit
8e60531d11
  1. 7
      neutron/agent/linux/ip_lib.py
  2. 4
      neutron/tests/unit/agent/linux/test_ip_lib.py

7
neutron/agent/linux/ip_lib.py

@ -43,7 +43,8 @@ LOG = logging.getLogger(__name__)
IP_NONLOCAL_BIND = 'net.ipv4.ip_nonlocal_bind'
LOOPBACK_DEVNAME = 'lo'
GRE_TUNNEL_DEVICE_NAMES = ['gre0', 'gretap0']
FB_TUNNEL_DEVICE_NAMES = ['gre0', 'gretap0', 'tunl0', 'erspan0', 'sit0',
'ip6tnl0', 'ip6gre0']
SYS_NET_PATH = '/sys/class/net'
DEFAULT_GW_PATTERN = re.compile(r"via (\S+)")
@ -123,7 +124,7 @@ class IPWrapper(SubProcessBase):
def device(self, name):
return IPDevice(name, namespace=self.namespace)
def get_devices(self, exclude_loopback=True, exclude_gre_devices=True):
def get_devices(self, exclude_loopback=True, exclude_fb_tun_devices=True):
retval = []
if self.namespace:
# we call out manually because in order to avoid screen scraping
@ -152,7 +153,7 @@ class IPWrapper(SubProcessBase):
for name in output:
if (exclude_loopback and name == LOOPBACK_DEVNAME or
exclude_gre_devices and name in GRE_TUNNEL_DEVICE_NAMES):
exclude_fb_tun_devices and name in FB_TUNNEL_DEVICE_NAMES):
continue
retval.append(IPDevice(name, namespace=self.namespace))

4
neutron/tests/unit/agent/linux/test_ip_lib.py

@ -263,9 +263,9 @@ class TestIpWrapper(base.BaseTestCase):
@mock.patch('neutron.agent.common.utils.execute')
def test_get_devices_exclude_loopback_and_gre(self, mocked_execute):
device_name = 'somedevice'
mocked_execute.return_value = 'lo gre0 gretap0 ' + device_name
mocked_execute.return_value = 'lo gre0 sit0 ip6gre0 ' + device_name
devices = ip_lib.IPWrapper(namespace='foo').get_devices(
exclude_loopback=True, exclude_gre_devices=True)
exclude_loopback=True, exclude_fb_tun_devices=True)
somedevice = devices.pop()
self.assertEqual(device_name, somedevice.name)
self.assertFalse(devices)

Loading…
Cancel
Save