summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2021-11-15 16:23:09 +0000
committerDavid Robertson <davidr@element.io>2021-11-16 18:46:51 +0000
commitd251ab87859290df36218efe15b72bf2d52a245c (patch)
tree0d2c374e208d22e321aa76ac34edb9bec75abff0
parentPull in EventPushActionsWorkerStore (diff)
downloadsynapse-d251ab87859290df36218efe15b72bf2d52a245c.tar.xz
Cache needs StreamWorkerStore
for _membership_stream_cache
-rw-r--r--synapse/replication/slave/storage/events.py2
-rw-r--r--synapse/storage/databases/main/cache.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/synapse/replication/slave/storage/events.py b/synapse/replication/slave/storage/events.py
index 37827f12ad..4fe829aa5b 100644
--- a/synapse/replication/slave/storage/events.py
+++ b/synapse/replication/slave/storage/events.py
@@ -48,10 +48,10 @@ logger = logging.getLogger(__name__)
 
 class SlavedEventStore(
     RoomMemberWorkerStore,
-    StreamWorkerStore,
     StateGroupWorkerStore,
     UserErasureWorkerStore,
     BaseSlavedStore,
+    StreamWorkerStore,
 ):
     def __init__(self, database: DatabasePool, db_conn, hs: "HomeServer"):
         super().__init__(database, db_conn, hs)
diff --git a/synapse/storage/databases/main/cache.py b/synapse/storage/databases/main/cache.py
index b936cdb9d5..7c9c93526e 100644
--- a/synapse/storage/databases/main/cache.py
+++ b/synapse/storage/databases/main/cache.py
@@ -34,6 +34,7 @@ from synapse.storage.databases.main.event_push_actions import (
     EventPushActionsWorkerStore,
 )
 from synapse.storage.databases.main.relations import RelationsWorkerStore
+from synapse.storage.databases.main.stream import StreamWorkerStore
 from synapse.storage.engines import PostgresEngine
 from synapse.storage.util.id_generators import MultiWriterIdGenerator
 from synapse.util.caches.descriptors import _CachedFunction
@@ -57,6 +58,7 @@ class CacheInvalidationWorkerStore(
     EventFederationWorkerStore,
     RelationsWorkerStore,
     EventPushActionsWorkerStore,
+    StreamWorkerStore,
 ):
     # This class must be mixed in with a child class which provides the following
     # attribute. TODO: can we get static analysis to enforce this?