Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Insert into the stream when a room in un-partial-stated
Browse files Browse the repository at this point in the history
  • Loading branch information
reivilibre committed Nov 17, 2022
1 parent 8d7bae8 commit 56395f9
Showing 1 changed file with 22 additions and 5 deletions.
27 changes: 22 additions & 5 deletions synapse/storage/databases/main/room.py
Original file line number Diff line number Diff line change
Expand Up @@ -2305,10 +2305,14 @@ async def clear_partial_state_room(self, room_id: str) -> bool:
still contains events with partial state.
"""
try:
await self.db_pool.runInteraction(
"clear_partial_state_room", self._clear_partial_state_room_txn, room_id
)
return True
async with self._un_partial_stated_rooms_stream_id_gen.get_next() as un_partial_state_room_stream_id:
await self.db_pool.runInteraction(
"clear_partial_state_room",
self._clear_partial_state_room_txn,
room_id,
un_partial_state_room_stream_id,
)
return True
except self.db_pool.engine.module.IntegrityError as e:
# Assume that any `IntegrityError`s are due to partial state events.
logger.info(
Expand All @@ -2319,7 +2323,10 @@ async def clear_partial_state_room(self, room_id: str) -> bool:
return False

def _clear_partial_state_room_txn(
self, txn: LoggingTransaction, room_id: str
self,
txn: LoggingTransaction,
room_id: str,
un_partial_state_room_stream_id: int,
) -> None:
DatabasePool.simple_delete_txn(
txn,
Expand All @@ -2336,6 +2343,16 @@ def _clear_partial_state_room_txn(
txn, self.get_partial_state_servers_at_join, (room_id,)
)

DatabasePool.simple_insert_txn(
txn,
"un_partial_state_room_stream",
{
"stream_id": un_partial_state_room_stream_id,
"instance_name": self._instance_name,
"room_id": room_id,
},
)

# We now delete anything from `device_lists_remote_pending` with a
# stream ID less than the minimum
# `partial_state_rooms.device_lists_stream_id`, as we no longer need them.
Expand Down

0 comments on commit 56395f9

Please sign in to comment.