From 0e7d79b61d39ec66ebb492b90005af85de9433ae Mon Sep 17 00:00:00 2001 From: David Robertson Date: Mon, 15 Nov 2021 16:10:26 +0000 Subject: Pull in EventPushActionsWorkerStore --- synapse/replication/slave/storage/events.py | 1 - synapse/storage/databases/main/cache.py | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/synapse/replication/slave/storage/events.py b/synapse/replication/slave/storage/events.py index 5856425c17..37827f12ad 100644 --- a/synapse/replication/slave/storage/events.py +++ b/synapse/replication/slave/storage/events.py @@ -48,7 +48,6 @@ logger = logging.getLogger(__name__) class SlavedEventStore( RoomMemberWorkerStore, - EventPushActionsWorkerStore, StreamWorkerStore, StateGroupWorkerStore, UserErasureWorkerStore, diff --git a/synapse/storage/databases/main/cache.py b/synapse/storage/databases/main/cache.py index d5fab29905..b936cdb9d5 100644 --- a/synapse/storage/databases/main/cache.py +++ b/synapse/storage/databases/main/cache.py @@ -30,6 +30,9 @@ from synapse.storage.database import ( LoggingTransaction, ) from synapse.storage.databases.main.event_federation import EventFederationWorkerStore +from synapse.storage.databases.main.event_push_actions import ( + EventPushActionsWorkerStore, +) from synapse.storage.databases.main.relations import RelationsWorkerStore from synapse.storage.engines import PostgresEngine from synapse.storage.util.id_generators import MultiWriterIdGenerator @@ -50,7 +53,11 @@ CURRENT_STATE_CACHE_NAME = "cs_cache_fake" _CacheData = Tuple[str, Optional[List[str]], Optional[int]] -class CacheInvalidationWorkerStore(EventFederationWorkerStore, RelationsWorkerStore): +class CacheInvalidationWorkerStore( + EventFederationWorkerStore, + RelationsWorkerStore, + EventPushActionsWorkerStore, +): # This class must be mixed in with a child class which provides the following # attribute. TODO: can we get static analysis to enforce this? _cache_id_gen: Optional[MultiWriterIdGenerator] -- cgit 1.5.1