tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Revert "Make all process_replication_rows methods async (#13304)" (#13312)

Browse source 
This reverts commit 5d4028f217.
This commit is contained in:
Erik Johnston 2022-07-18 14:28:14 +01:00 committed by GitHub
parent cf5fa5063d
commit f721f1baba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 25 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/13304.misc
View file

@ -1 +0,0 @@
Make all replication row processing methods asynchronous. Contributed by Nick @ Beeper (@fizzadar).

4
synapse/handlers/typing.py
View file

@ -158,7 +158,7 @@ class FollowerTypingHandler:
except Exception:
logger.exception("Error pushing typing notif to remotes")
async def process_replication_rows(
def process_replication_rows(
self, token: int, rows: List[TypingStream.TypingStreamRow]
) -> None:
"""Should be called whenever we receive updates for typing stream."""
@ -444,7 +444,7 @@ class TypingWriterHandler(FollowerTypingHandler):
return rows, current_id, limited
async def process_replication_rows(
def process_replication_rows(
self, token: int, rows: List[TypingStream.TypingStreamRow]
) -> None:
# The writing process should never get updates from replication.

6
synapse/replication/slave/storage/devices.py
View file

@ -49,7 +49,7 @@ class SlavedDeviceStore(DeviceWorkerStore, BaseSlavedStore):
def get_device_stream_token(self) -> int:
return self._device_list_id_gen.get_current_token()
async def process_replication_rows(
def process_replication_rows(
self, stream_name: str, instance_name: str, token: int, rows: Iterable[Any]
) -> None:
if stream_name == DeviceListsStream.NAME:
@ -59,9 +59,7 @@ class SlavedDeviceStore(DeviceWorkerStore, BaseSlavedStore):
self._device_list_id_gen.advance(instance_name, token)
for row in rows:
self._user_signature_stream_cache.entity_has_changed(row.user_id, token)
return await super().process_replication_rows(
stream_name, instance_name, token, rows
)
return super().process_replication_rows(stream_name, instance_name, token, rows)
def _invalidate_caches_for_devices(
self, token: int, rows: Iterable[DeviceListsStream.DeviceListsStreamRow]

6
synapse/replication/slave/storage/push_rule.py
View file

@ -24,7 +24,7 @@ class SlavedPushRuleStore(SlavedEventStore, PushRulesWorkerStore):
def get_max_push_rules_stream_id(self) -> int:
return self._push_rules_stream_id_gen.get_current_token()
async def process_replication_rows(
def process_replication_rows(
self, stream_name: str, instance_name: str, token: int, rows: Iterable[Any]
) -> None:
if stream_name == PushRulesStream.NAME:
@ -33,6 +33,4 @@ class SlavedPushRuleStore(SlavedEventStore, PushRulesWorkerStore):
self.get_push_rules_for_user.invalidate((row.user_id,))
self.get_push_rules_enabled_for_user.invalidate((row.user_id,))
self.push_rules_stream_cache.entity_has_changed(row.user_id, token)
return await super().process_replication_rows(
stream_name, instance_name, token, rows
)
return super().process_replication_rows(stream_name, instance_name, token, rows)

6
synapse/replication/slave/storage/pushers.py
View file

@ -40,11 +40,9 @@ class SlavedPusherStore(PusherWorkerStore, BaseSlavedStore):
def get_pushers_stream_token(self) -> int:
return self._pushers_id_gen.get_current_token()
async def process_replication_rows(
def process_replication_rows(
self, stream_name: str, instance_name: str, token: int, rows: Iterable[Any]
) -> None:
if stream_name == PushersStream.NAME:
self._pushers_id_gen.advance(instance_name, token)
return await super().process_replication_rows(
stream_name, instance_name, token, rows
)
return super().process_replication_rows(stream_name, instance_name, token, rows)

6
synapse/replication/tcp/client.py
View file

@ -144,15 +144,13 @@ class ReplicationDataHandler:
token: stream token for this batch of rows
rows: a list of Stream.ROW_TYPE objects as returned by Stream.parse_row.
"""
await self.store.process_replication_rows(
stream_name, instance_name, token, rows
)
self.store.process_replication_rows(stream_name, instance_name, token, rows)
if self.send_handler:
await self.send_handler.process_replication_rows(stream_name, token, rows)
if stream_name == TypingStream.NAME:
await self._typing_handler.process_replication_rows(token, rows)
self._typing_handler.process_replication_rows(token, rows)
self.notifier.on_new_event(
StreamKeyType.TYPING, token, rooms=[row.room_id for row in rows]
)

2
synapse/storage/_base.py
View file

@ -47,7 +47,7 @@ class SQLBaseStore(metaclass=ABCMeta):
self.database_engine = database.engine
self.db_pool = database
async def process_replication_rows(
def process_replication_rows(
self,
stream_name: str,
instance_name: str,

4
synapse/storage/databases/main/account_data.py
View file

@ -414,7 +414,7 @@ class AccountDataWorkerStore(PushRulesWorkerStore, CacheInvalidationWorkerStore)
)
)
async def process_replication_rows(
def process_replication_rows(
self,
stream_name: str,
instance_name: str,
@ -437,7 +437,7 @@ class AccountDataWorkerStore(PushRulesWorkerStore, CacheInvalidationWorkerStore)
)
self._account_data_stream_cache.entity_has_changed(row.user_id, token)
await super().process_replication_rows(stream_name, instance_name, token, rows)
super().process_replication_rows(stream_name, instance_name, token, rows)
async def add_account_data_to_room(
self, user_id: str, room_id: str, account_data_type: str, content: JsonDict

4
synapse/storage/databases/main/cache.py
View file

@ -119,7 +119,7 @@ class CacheInvalidationWorkerStore(SQLBaseStore):
"get_all_updated_caches", get_all_updated_caches_txn
)
async def process_replication_rows(
def process_replication_rows(
self, stream_name: str, instance_name: str, token: int, rows: Iterable[Any]
) -> None:
if stream_name == EventsStream.NAME:
@ -154,7 +154,7 @@ class CacheInvalidationWorkerStore(SQLBaseStore):
else:
self._attempt_to_invalidate_cache(row.cache_func, row.keys)
await super().process_replication_rows(stream_name, instance_name, token, rows)
super().process_replication_rows(stream_name, instance_name, token, rows)
def _process_event_stream_row(self, token: int, row: EventsStreamRow) -> None:
data = row.data

6
synapse/storage/databases/main/deviceinbox.py
View file

@ -128,7 +128,7 @@ class DeviceInboxWorkerStore(SQLBaseStore):
prefilled_cache=device_outbox_prefill,
)
async def process_replication_rows(
def process_replication_rows(
self,
stream_name: str,
instance_name: str,
@ -148,9 +148,7 @@ class DeviceInboxWorkerStore(SQLBaseStore):
self._device_federation_outbox_stream_cache.entity_has_changed(
row.entity, token
)
return await super().process_replication_rows(
stream_name, instance_name, token, rows
)
return super().process_replication_rows(stream_name, instance_name, token, rows)
def get_to_device_stream_token(self) -> int:
return self._device_inbox_id_gen.get_current_token()

4
synapse/storage/databases/main/events_worker.py
View file

@ -280,7 +280,7 @@ class EventsWorkerStore(SQLBaseStore):
id_column="chain_id",
)
async def process_replication_rows(
def process_replication_rows(
self,
stream_name: str,
instance_name: str,
@ -292,7 +292,7 @@ class EventsWorkerStore(SQLBaseStore):
elif stream_name == BackfillStream.NAME:
self._backfill_id_gen.advance(instance_name, -token)
await super().process_replication_rows(stream_name, instance_name, token, rows)
super().process_replication_rows(stream_name, instance_name, token, rows)
async def have_censored_event(self, event_id: str) -> bool:
"""Check if an event has been censored, i.e. if the content of the event has been erased

6
synapse/storage/databases/main/presence.py
View file

@ -431,7 +431,7 @@ class PresenceStore(PresenceBackgroundUpdateStore, CacheInvalidationWorkerStore)
self._presence_on_startup = []
return active_on_startup
async def process_replication_rows(
def process_replication_rows(
self,
stream_name: str,
instance_name: str,
@ -443,6 +443,4 @@ class PresenceStore(PresenceBackgroundUpdateStore, CacheInvalidationWorkerStore)
for row in rows:
self.presence_stream_cache.entity_has_changed(row.user_id, token)
self._get_presence_for_user.invalidate((row.user_id,))
return await super().process_replication_rows(
stream_name, instance_name, token, rows
)
return super().process_replication_rows(stream_name, instance_name, token, rows)

6
synapse/storage/databases/main/receipts.py
View file

@ -589,7 +589,7 @@ class ReceiptsWorkerStore(SQLBaseStore):
"get_unread_event_push_actions_by_room_for_user", (room_id,)
)
async def process_replication_rows(
def process_replication_rows(
self,
stream_name: str,
instance_name: str,
@ -604,9 +604,7 @@ class ReceiptsWorkerStore(SQLBaseStore):
)
self._receipts_stream_cache.entity_has_changed(row.room_id, token)
return await super().process_replication_rows(
stream_name, instance_name, token, rows
)
return super().process_replication_rows(stream_name, instance_name, token, rows)
def _insert_linearized_receipt_txn(
self,

4
synapse/storage/databases/main/tags.py
View file

@ -292,7 +292,7 @@ class TagsWorkerStore(AccountDataWorkerStore):
# than the id that the client has.
pass
async def process_replication_rows(
def process_replication_rows(
self,
stream_name: str,
instance_name: str,
@ -305,7 +305,7 @@ class TagsWorkerStore(AccountDataWorkerStore):
self.get_tags_for_user.invalidate((row.user_id,))
self._account_data_stream_cache.entity_has_changed(row.user_id, token)
await super().process_replication_rows(stream_name, instance_name, token, rows)
super().process_replication_rows(stream_name, instance_name, token, rows)
class TagsStore(TagsWorkerStore):