summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-01-16 15:08:17 +0000
committerErik Johnston <erik@matrix.org>2017-01-16 15:08:17 +0000
commit897f8752da3c9f7b2d214fe91e8356be5db545c3 (patch)
tree9418fef541028db04b6f55867da127b9f4a76bba /synapse
parentAdd support for 'iterable' to ExpiringCache (diff)
downloadsynapse-897f8752da3c9f7b2d214fe91e8356be5db545c3.tar.xz
Up cache max entries for state
Diffstat (limited to 'synapse')
-rw-r--r--synapse/state.py2
-rw-r--r--synapse/storage/roommember.py2
-rw-r--r--synapse/storage/state.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/synapse/state.py b/synapse/state.py
index 461e82acdf..66e1a685e8 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -41,7 +41,7 @@ KeyStateTuple = namedtuple("KeyStateTuple", ("context", "type", "state_key"))
 CACHE_SIZE_FACTOR = float(os.environ.get("SYNAPSE_CACHE_FACTOR", 0.1))
 
 
-SIZE_OF_CACHE = int(10000 * CACHE_SIZE_FACTOR)
+SIZE_OF_CACHE = int(100000 * CACHE_SIZE_FACTOR)
 EVICTION_TIMEOUT_SECONDS = 60 * 60
 
 
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index 8dce89073d..768e0a4451 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -391,7 +391,7 @@ class RoomMemberStore(SQLBaseStore):
         )
 
     @cachedInlineCallbacks(num_args=2, cache_context=True, iterable=True,
-                           max_entries=50000)
+                           max_entries=100000)
     def _get_joined_users_from_context(self, room_id, state_group, current_state_ids,
                                        cache_context, event=None):
         # We don't use `state_group`, it's there so that we can cache based
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index fe942ecad7..7d34dd03bf 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -284,7 +284,7 @@ class StateStore(SQLBaseStore):
             return [r[0] for r in results]
         return self.runInteraction("get_current_state_for_key", f)
 
-    @cached(num_args=2, max_entries=50000, iterable=True)
+    @cached(num_args=2, max_entries=100000, iterable=True)
     def _get_state_group_from_group(self, group, types):
         raise NotImplementedError()