openstack/kuryr-kubernetes
Code Issues Proposed changes

Fix problem of changing size during dict iteration

Browse Source 
Change-Id: I8bfcd5d6b33ab1d759a9bf8066398021eddcdfa2
Closes-Bug: 1859005
This commit is contained in:
Luis Tomas Bolivar
2020-01-09 11:52:47 +01:00
parent 837d718984
commit a538eae343
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kuryr_kubernetes/controller/drivers/vif_pool.py
View File

@@ -303,7 +303,7 @@ class BaseVIFPool(base.VIFPoolDriver):
def remove_sg_from_pools(self, sg_id, net_id): def remove_sg_from_pools(self, sg_id, net_id):
neutron = clients.get_neutron_client() neutron = clients.get_neutron_client()
for pool_key, pool_ports in self._available_ports_pools.items(): for pool_key, pool_ports in list(self._available_ports_pools.items()):
if self._get_pool_key_net(pool_key) != net_id: if self._get_pool_key_net(pool_key) != net_id:
continue continue
for sg_key, ports in pool_ports.items(): for sg_key, ports in pool_ports.items():
@@ -555,7 +555,7 @@ class NeutronVIFPool(BaseVIFPool):
sg_current[port['id']] = tuple(sorted( sg_current[port['id']] = tuple(sorted(
port['security_groups'])) port['security_groups']))
for port_id, pool_key in self._recyclable_ports.copy().items(): for port_id, pool_key in list(self._recyclable_ports.items()):
if (not oslo_cfg.CONF.vif_pool.ports_pool_max or if (not oslo_cfg.CONF.vif_pool.ports_pool_max or
self._get_pool_size(pool_key) < self._get_pool_size(pool_key) <
oslo_cfg.CONF.vif_pool.ports_pool_max): oslo_cfg.CONF.vif_pool.ports_pool_max):
@@ -662,8 +662,7 @@ class NeutronVIFPool(BaseVIFPool):
# on the available_ports_pools dict. The next call forces it to be on # on the available_ports_pools dict. The next call forces it to be on
# that dict before cleaning it up # that dict before cleaning it up
self._trigger_return_to_pool() self._trigger_return_to_pool()
available_ports_pools = self._available_ports_pools.copy() for pool_key, ports in list(self._available_ports_pools.items()):
for pool_key, ports in available_ports_pools.items():
if self._get_pool_key_net(pool_key) != net_id: if self._get_pool_key_net(pool_key) != net_id:
continue continue
ports_id = [] ports_id = []
@@ -826,7 +825,7 @@ class NestedVIFPool(BaseVIFPool):
sg_current[subport['id']] = tuple(sorted( sg_current[subport['id']] = tuple(sorted(
subport['security_groups'])) subport['security_groups']))
for port_id, pool_key in self._recyclable_ports.copy().items(): for port_id, pool_key in list(self._recyclable_ports.items()):
if (not oslo_cfg.CONF.vif_pool.ports_pool_max or if (not oslo_cfg.CONF.vif_pool.ports_pool_max or
self._get_pool_size(pool_key) < self._get_pool_size(pool_key) <
oslo_cfg.CONF.vif_pool.ports_pool_max): oslo_cfg.CONF.vif_pool.ports_pool_max):
@@ -1048,8 +1047,7 @@ class NestedVIFPool(BaseVIFPool):
# on the available_ports_pools dict. The next call forces it to be on # on the available_ports_pools dict. The next call forces it to be on
# that dict before cleaning it up # that dict before cleaning it up
self._trigger_return_to_pool() self._trigger_return_to_pool()
available_ports_pools = self._available_ports_pools.copy() for pool_key, ports in list(self._available_ports_pools.items()):
for pool_key, ports in available_ports_pools.items():
if self._get_pool_key_net(pool_key) != net_id: if self._get_pool_key_net(pool_key) != net_id:
continue continue
trunk_id = self._get_trunk_id(neutron, pool_key) trunk_id = self._get_trunk_id(neutron, pool_key)