Delete events from federation_inbound_events_staging table on purge (#…

…12770)
matrix-org · May 17, 2022 · 182ca78 · 182ca78
1 parent 5331fb5
commit 182ca78
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/changelog.d/12770.bugfix b/changelog.d/12770.bugfix
@@ -0,0 +1 @@
+Delete events from the `federation_inbound_events_staging` table when a room is purged through the admin API.
diff --git a/synapse/storage/databases/main/purge_events.py b/synapse/storage/databases/main/purge_events.py
@@ -417,6 +417,7 @@ def _purge_room_txn(self, txn: LoggingTransaction, room_id: str) -> List[int]:
             "room_account_data",
             "room_tags",
             "local_current_membership",
+            "federation_inbound_events_staging",
         ):
             logger.info("[purge] removing %s from %s", room_id, table)
             txn.execute("DELETE FROM %s WHERE room_id=?" % (table,), (room_id,))

diff --git a/tests/rest/admin/test_room.py b/tests/rest/admin/test_room.py
@@ -2489,4 +2489,5 @@ def _block_room(self, room_id: str) -> None:
     "room_tags",
     # "state_groups",  # Current impl leaves orphaned state groups around.
     "state_groups_state",
+    "federation_inbound_events_staging",
 ]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Delete events from the `federation_inbound_events_staging` table when a room is purged through the admin API.