Properly redact caches.

synapse/storage/databases/main/cache.py

@@ -197,7 +197,11 @@ def _invalidate_caches_for_event(
             self.get_invited_rooms_for_local_user.invalidate((state_key,))
 
         if relates_to:
-            self._invalidate_relations_for_event(relates_to)
+            self.get_relations_for_event.invalidate((event_id,))
+            self.get_aggregation_groups_for_event.invalidate((event_id,))
+            self.get_applicable_edit.invalidate((event_id,))
+            self.get_thread_summary.invalidate((event_id,))
+            self.get_thread_participated.invalidate((event_id,))
 
     async def invalidate_cache_and_stream(self, cache_name: str, keys: Tuple[Any, ...]):
         """Invalidates the cache and adds it to the cache stream so slaves

synapse/storage/databases/main/events.py

@@ -1964,7 +1964,21 @@ def _handle_redact_relations(
         )
         # Any relation information for the related events must be cleared.
         if relates_to is not None:
-            txn.call_after(self.store._invalidate_relations_for_event, relates_to)
+            self.store._invalidate_cache_and_stream(
+                txn, self.store.get_relations_for_event, (relates_to,)
+            )
+            self.store._invalidate_cache_and_stream(
+                txn, self.store.get_aggregation_groups_for_event, (relates_to,)
+            )
+            self.store._invalidate_cache_and_stream(
+                txn, self.store.get_applicable_edit, (relates_to,)
+            )
+            self.store._invalidate_cache_and_stream(
+                txn, self.store.get_thread_summary, (relates_to,)
+            )
+            self.store._invalidate_cache_and_stream(
+                txn, self.store.get_thread_participated, (relates_to,)
+            )
 
         self.db_pool.simple_delete_txn(
             txn, table="event_relations", keyvalues={"event_id": redacted_event_id}

synapse/storage/databases/main/relations.py

@@ -91,14 +91,6 @@ def __init__(
 
         self._msc3440_enabled = hs.config.experimental.msc3440_enabled
 
-    def _invalidate_relations_for_event(self, event_id: str) -> None:
-        """Invalidate the relation caches for an event."""
-        self.get_relations_for_event.invalidate((event_id,))
-        self.get_aggregation_groups_for_event.invalidate((event_id,))
-        self.get_applicable_edit.invalidate((event_id,))
-        self.get_thread_summary.invalidate((event_id,))
-        self.get_thread_participated.invalidate((event_id,))
-
     @cached(tree=True)
     async def get_relations_for_event(
         self,