Newsfile

Signed-off-by: Olivier Wilkinson (reivilibre) <oliverw@matrix.org>

changelog.d/13495.misc

@@ -0,0 +1 @@
+Add logging for investigating problems when updating the current state in the database.

synapse/storage/controllers/persist_events.py

@@ -655,6 +655,8 @@ class EventsPersistenceStorageController:
                         with Measure(
                             self._clock, "persist_events.get_new_state_after_events"
                         ):
+                            logger.debug("old extremities: %r", latest_event_ids)
+                            logger.debug("new extremities: %r", new_latest_event_ids)
                             res = await self._get_new_state_after_events(
                                 room_id,
                                 ev_ctx_rm,
@@ -662,6 +664,11 @@ class EventsPersistenceStorageController:
                                 new_latest_event_ids,
                             )
                             current_state, delta_ids, new_latest_event_ids = res
+                            logger.debug(
+                                "delta IDs: %r, new latest event IDs: %r",
+                                delta_ids,
+                                new_latest_event_ids,
+                            )
 
                             # there should always be at least one forward extremity.
                             # (except during the initial persistence of the send_join

synapse/storage/databases/main/events.py

@@ -209,14 +209,19 @@ class PersistEventsStore:
             for (event, _), stream in zip(events_and_contexts, stream_orderings):
                 event.internal_metadata.stream_ordering = stream
 
-            await self.db_pool.runInteraction(
-                "persist_events",
-                self._persist_events_txn,
-                events_and_contexts=events_and_contexts,
-                inhibit_local_membership_updates=inhibit_local_membership_updates,
-                state_delta_for_room=state_delta_for_room,
-                new_forward_extremities=new_forward_extremities,
-            )
+            try:
+                await self.db_pool.runInteraction(
+                    "persist_events",
+                    self._persist_events_txn,
+                    events_and_contexts=events_and_contexts,
+                    inhibit_local_membership_updates=inhibit_local_membership_updates,
+                    state_delta_for_room=state_delta_for_room,
+                    new_forward_extremities=new_forward_extremities,
+                )
+            except Exception:
+                logger.debug("events_and_contexts: %r", events_and_contexts)
+                logger.debug("state_delta_for_room: %r", state_delta_for_room)
+                raise
             persist_event_counter.inc(len(events_and_contexts))
 
             if not use_negative_stream_ordering: