openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Ensure readiness probe waits for sync pools upon controller restart 

This patch ensures the readiness probe is still waiting for the
pools to be sync after a kuryr-controller pod restart. In addition
it also changes the order of syncing pools and cleanup leftovers
ports.

Change-Id: I6aa30ee17fa172d88edd54cd7d1f47212b087d1c
This commit is contained in:
Luis Tomas Bolivar 2019-08-21 12:48:59 +02:00
parent 5c2f3026ec
commit 492036e224
1 changed files with 9 additions and 1 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

@ -16,6 +16,7 @@
import abc
import collections
import eventlet
import os
import six
import time
@ -302,14 +303,21 @@ class BaseVIFPool(base.VIFPoolDriver):
@lockutils.synchronized('return_to_pool_baremetal')
@lockutils.synchronized('return_to_pool_nested')
def sync_pools(self):
# NOTE(ltomasbo): Ensure readiness probe is not set to true until the
# pools sync is completed in case of controller restart
try:
os.remove('/tmp/pools_loaded')
except OSError:
pass
self._available_ports_pools = collections.defaultdict()
self._existing_vifs = collections.defaultdict()
self._recyclable_ports = collections.defaultdict()
self._last_update = collections.defaultdict()
# NOTE(ltomasbo): Ensure previously created ports are recovered into
# their respective pools
self._recover_precreated_ports()
self._cleanup_leftover_ports()
self._recover_precreated_ports()
def _get_trunks_info(self):
"""Returns information about trunks and their subports.