From f3aa3a306ed2326ddc027401e674237f476d8188 Mon Sep 17 00:00:00 2001
From: "Olivier Wilkinson (reivilibre)" <oliverw@matrix.org>
Date: Wed, 16 Nov 2022 14:36:01 +0000
Subject: [PATCH] Insert into the stream when a room in un-partial-stated

---
 synapse/storage/databases/main/room.py | 27 +++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/synapse/storage/databases/main/room.py b/synapse/storage/databases/main/room.py
index 302043aad03c..e7cf518de1f1 100644
--- a/synapse/storage/databases/main/room.py
+++ b/synapse/storage/databases/main/room.py
@@ -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(
@@ -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,
@@ -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.