zuul/zuul
Code Issues Proposed changes

Merge "Add some debug logging to change cache"

Browse Source
This commit is contained in:
Zuul 2021-10-27 14:37:51 +00:00 committed by Gerrit Code Review
commit 69f93b6c75
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zuul/zk/change_cache.py
View File

@ -138,9 +138,11 @@ class AbstractChangeCache(ZooKeeperSimpleBase, Iterable, abc.ABC):
cleaned up in the cache's cleanup() method. This is expected to cleaned up in the cache's cleanup() method. This is expected to
happen periodically. happen periodically.
""" """
log = logging.getLogger("zuul.zk.AbstractChangeCache")
def __init__(self, client, connection): def __init__(self, client, connection):
self.log = logging.getLogger(
f"zuul.ChangeCache.{connection.connection_name}")
super().__init__(client) super().__init__(client)
self.connection = connection self.connection = connection
self.root_path = f"{CHANGE_CACHE_ROOT}/{connection.connection_name}" self.root_path = f"{CHANGE_CACHE_ROOT}/{connection.connection_name}"
@ -170,6 +172,7 @@ class AbstractChangeCache(ZooKeeperSimpleBase, Iterable, abc.ABC):
existing_keys = set(self._change_cache.keys()) existing_keys = set(self._change_cache.keys())
deleted_keys = existing_keys - cache_keys deleted_keys = existing_keys - cache_keys
for key in deleted_keys: for key in deleted_keys:
self.log.debug("Watcher removing %s from cache", key)
with contextlib.suppress(KeyError): with contextlib.suppress(KeyError):
del self._change_cache[key] del self._change_cache[key]
with contextlib.suppress(KeyError): with contextlib.suppress(KeyError):
@ -200,6 +203,7 @@ class AbstractChangeCache(ZooKeeperSimpleBase, Iterable, abc.ABC):
return key, data['data_uuid'] return key, data['data_uuid']
def prune(self, relevant, max_age=3600): # 1h def prune(self, relevant, max_age=3600): # 1h
self.log.debug("Pruning cache")
cutoff_time = time.time() - max_age cutoff_time = time.time() - max_age
outdated_versions = dict() outdated_versions = dict()
for c in list(self._change_cache.values()): for c in list(self._change_cache.values()):
@ -218,6 +222,7 @@ class AbstractChangeCache(ZooKeeperSimpleBase, Iterable, abc.ABC):
self.delete(key, outdated_versions[key]) self.delete(key, outdated_versions[key])
def cleanup(self): def cleanup(self):
self.log.debug("Cleaning cache")
valid_uuids = {c.cache_stat.uuid valid_uuids = {c.cache_stat.uuid
for c in list(self._change_cache.values())} for c in list(self._change_cache.values())}
stale_uuids = self._data_cleanup_candidates - valid_uuids stale_uuids = self._data_cleanup_candidates - valid_uuids
@ -358,6 +363,7 @@ class AbstractChangeCache(ZooKeeperSimpleBase, Iterable, abc.ABC):
return change return change
def delete(self, key, version=-1): def delete(self, key, version=-1):
self.log.debug("Deleting %s from cache", key)
cache_path = self._cachePath(key._hash) cache_path = self._cachePath(key._hash)
# Only delete the cache entry and NOT the data node in order to # Only delete the cache entry and NOT the data node in order to
# prevent race conditions with other consumers. The stale data # prevent race conditions with other consumers. The stale data