From ecda137ddce8c74a11be7ad2ddec7e4f68574a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dulko?= Date: Fri, 3 Apr 2020 13:26:56 +0200 Subject: [PATCH] Remove MEMOIZE from get_pod_ip get_pod_ip() does not make any API calls and just gets the IP from VIF annotation. Maybe it would make some sense to cache it to avoid several dict lookups, but current version bases cache on whole pod object, which we know may change often over time, so I don't think there's a point in keeping the cache here. Change-Id: Id441700ac7add94a675c3a38434abae0b826b766 --- kuryr_kubernetes/controller/drivers/utils.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/kuryr_kubernetes/controller/drivers/utils.py b/kuryr_kubernetes/controller/drivers/utils.py index 34bb116f6..88f5fd7fe 100644 --- a/kuryr_kubernetes/controller/drivers/utils.py +++ b/kuryr_kubernetes/controller/drivers/utils.py @@ -16,7 +16,6 @@ import urllib from openstack import exceptions as os_exc -from oslo_cache import core as cache from oslo_config import cfg from oslo_log import log from oslo_serialization import jsonutils @@ -34,20 +33,6 @@ LOG = log.getLogger(__name__) CONF = cfg.CONF -pod_ip_caching_opts = [ - cfg.BoolOpt('caching', default=True), - cfg.IntOpt('cache_time', default=3600), -] - -CONF.register_opts(pod_ip_caching_opts, "pod_ip_caching") - -cache.configure(CONF) -pod_ip_cache_region = cache.create_region() -MEMOIZE = cache.get_memoization_decorator( - CONF, pod_ip_cache_region, "pod_ip_caching") - -cache.configure_cache_region(CONF, pod_ip_cache_region) - def get_network_id(subnets): ids = list(set(net.id for net in subnets.values())) @@ -275,7 +260,6 @@ def create_security_group_rule_body( return security_group_rule_body -@MEMOIZE def get_pod_ip(pod): try: pod_metadata = pod['metadata']['annotations']