summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-05-05 10:33:23 +0100
committerErik Johnston <erik@matrix.org>2021-05-05 10:33:23 +0100
commitadef51ab98fd21e6ddb996278db02a67a1638be0 (patch)
tree6405e4b6ea652e580a5143a55aec01fa7ed1e30c
parentLog contexts (diff)
downloadsynapse-adef51ab98fd21e6ddb996278db02a67a1638be0.tar.xz
Fix cache metrics
-rw-r--r--synapse/util/caches/lrucache.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/synapse/util/caches/lrucache.py b/synapse/util/caches/lrucache.py

index 0cbd6932f6..1be675e014 100644 --- a/synapse/util/caches/lrucache.py +++ b/synapse/util/caches/lrucache.py
@@ -32,7 +32,8 @@ from typing import ( from typing_extensions import Literal from synapse.config import cache as cache_config -from synapse.util.caches import TRACK_MEMORY_USAGE, CacheMetric, register_cache +from synapse.util import caches +from synapse.util.caches import CacheMetric, register_cache from synapse.util.caches.treecache import TreeCache try: @@ -111,7 +112,7 @@ class _Node: self.add_callbacks(callbacks) self.memory = 0 - if TRACK_MEMORY_USAGE: + if caches.TRACK_MEMORY_USAGE: self.memory = ( _get_size_of(key) + _get_size_of(value) @@ -269,7 +270,7 @@ class LruCache(Generic[KT, VT]): if size_callback: cached_cache_len[0] += size_callback(node.value) - if TRACK_MEMORY_USAGE and metrics: + if caches.TRACK_MEMORY_USAGE and metrics: metrics.inc_memory_usage(node.memory) def move_node_to_front(node): @@ -297,7 +298,7 @@ class LruCache(Generic[KT, VT]): node.run_and_clear_callbacks() - if TRACK_MEMORY_USAGE and metrics: + if caches.TRACK_MEMORY_USAGE and metrics: metrics.dec_memory_usage(node.memory) return deleted_len @@ -415,7 +416,7 @@ class LruCache(Generic[KT, VT]): if size_callback: cached_cache_len[0] = 0 - if TRACK_MEMORY_USAGE and metrics: + if caches.TRACK_MEMORY_USAGE and metrics: metrics.clear_memory_usage() @synchronized