openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Fix more problem of changing size during dict iteration 

Change-Id: Ie1d7fb2d7d62c1a43a32d513fdcbbb265bebff98
Closes-Bug: 1859005
(cherry picked from commit c7b8816c35)
This commit is contained in:
Luis Tomas Bolivar 2020-01-16 11:57:47 +01:00
parent 28af913826
commit 7f17c94476
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,7 +305,7 @@ class BaseVIFPool(base.VIFPoolDriver):
for pool_key, pool_ports in list(self._available_ports_pools.items()):
if self._get_pool_key_net(pool_key) != net_id:
continue
for sg_key, ports in pool_ports.items():
for sg_key, ports in list(pool_ports.items()):
if sg_id not in sg_key:
continue
# remove the pool associated to that SG
@ -478,7 +478,7 @@ class NeutronVIFPool(BaseVIFPool):
pool_updates = self._last_update.get(pool_key, {})
if not pool_updates:
# No pools update info. Selecting a random one
for sg_group, ports in pool_ports.items():
for sg_group, ports in list(pool_ports.items()):
if len(ports) > 0:
port_id = pool_ports[sg_group].pop()
break
@ -486,7 +486,7 @@ class NeutronVIFPool(BaseVIFPool):
raise exceptions.ResourceNotReady(pod)
else:
min_date = -1
for sg_group, date in pool_updates.items():
for sg_group, date in list(pool_updates.items()):
if pool_ports.get(sg_group):
if min_date == -1 or date < min_date:
min_date = date
@ -749,7 +749,7 @@ class NestedVIFPool(BaseVIFPool):
pool_updates = self._last_update.get(pool_key, {})
if not pool_updates:
# No pools update info. Selecting a random one
for sg_group, ports in pool_ports.items():
for sg_group, ports in list(pool_ports.items()):
if len(ports) > 0:
port_id = pool_ports[sg_group].pop()
break
@ -757,7 +757,7 @@ class NestedVIFPool(BaseVIFPool):
raise exceptions.ResourceNotReady(pod)
else:
min_date = -1
for sg_group, date in pool_updates.items():
for sg_group, date in list(pool_updates.items()):
if pool_ports.get(sg_group):
if min_date == -1 or date < min_date:
min_date = date