Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1884655: Add protection from unexpected issues #366

Merged
merged 1 commit into from
Oct 9, 2020
Merged

Bug 1884655: Add protection from unexpected issues #366

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 38 additions & 6 deletions kuryr_kubernetes/controller/drivers/vif_pool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,12 +509,27 @@ def _trigger_removed_nodes_ports_cleanup(self, previous_ports_to_remove):
subnets_ids = [config.CONF.neutron_defaults.pod_subnet]

# NOTE(ltomasbo): Detached subports gets their device_owner unset
detached_subports = os_net.ports(
device_owner='', status='DOWN', tags=tags)
detached_subports = os_net.ports(status='DOWN', tags=tags)
for subport in detached_subports:
# FIXME(ltomasbo): Looking for trunk:subport is only needed
# due to a bug in neutron that does not reset the
# device_owner after the port is detached from the trunk
if subport.device_owner not in ['', 'trunk:subport']:
continue
if subport.id not in previous_ports_to_remove:
# FIXME(ltomasbo): Until the above problem is there,
# we need to add protection for recently created ports
# that are still being attached
previous_ports_to_remove.append(subport.id)
continue
# check if port belonged to kuryr and it was a subport
# FIXME(ltomasbo): Assuming single stack
if subport.fixed_ips[0]['subnet_id'] not in subnets_ids:
if len(subport.fixed_ips) != 1:
# This should never happen as there is no option to create
# ports without IPs in Neutron, yet we hit it. So adding
# protection from it
continue
if subport.fixed_ips[0].get('subnet_id') not in subnets_ids:
continue
try:
del self._existing_vifs[subport.id]
Expand All @@ -525,6 +540,8 @@ def _trigger_removed_nodes_ports_cleanup(self, previous_ports_to_remove):
except os_exc.SDKException:
LOG.debug("Problem deleting leftover port %s. "
"Skipping.", subport.id)
else:
previous_ports_to_remove.remove(subport.id)

# normal ports, or subports not yet attached
existing_ports = os_net.ports(
Expand Down Expand Up @@ -554,7 +571,8 @@ def _trigger_removed_nodes_ports_cleanup(self, previous_ports_to_remove):
except os_exc.SDKException:
LOG.debug("Problem deleting leftover port %s. "
"Skipping.", port.id)
previous_ports_to_remove.remove(port.id)
else:
previous_ports_to_remove.remove(port.id)


class NeutronVIFPool(BaseVIFPool):
Expand Down Expand Up @@ -605,7 +623,14 @@ def _get_port_from_pool(self, pool_key, pod, subnets, security_groups):
oslo_cfg.CONF.vif_pool.ports_pool_min):
eventlet.spawn(self._populate_pool, pool_key, pod, subnets,
security_groups)
return self._existing_vifs[port_id]
# Add protection from port_id not in existing_vifs
try:
port = self._existing_vifs[port_id]
except KeyError:
LOG.debug('Missing port on existing_vifs, this should not happen.'
' Retrying.')
raise exceptions.ResourceNotReady(pod)
return port

def _return_ports_to_pool(self):
"""Recycle ports to be reused by future pods.
Expand Down Expand Up @@ -864,7 +889,14 @@ def _get_port_from_pool(self, pool_key, pod, subnets, security_groups):
oslo_cfg.CONF.vif_pool.ports_pool_min):
eventlet.spawn(self._populate_pool, pool_key, pod, subnets,
security_groups)
return self._existing_vifs[port_id]
# Add protection from port_id not in existing_vifs
try:
port = self._existing_vifs[port_id]
except KeyError:
LOG.debug('Missing port on existing_vifs, this should not happen.'
' Retrying.')
raise exceptions.ResourceNotReady(pod)
return port

def _return_ports_to_pool(self):
"""Recycle ports to be reused by future pods.
Expand Down