Run remove_push_actions_from_staging in foreground

If we got an error persisting an event, we would try to remove the push actions asynchronously, which would lead to a 'Re-starting finished log context' warning. I don't think there's any need for this to be asynchronous.
matrix-org · Aug 13, 2020 · e1faf7f · e1faf7f
1 parent ff0e894
commit e1faf7f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/changelog.d/8081.bugfix b/changelog.d/8081.bugfix
@@ -0,0 +1 @@
+Fix `Re-starting finished log context PUT-nnnn` warning when event persistence failed.
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
@@ -891,9 +891,7 @@ async def handle_new_client_event(
         except Exception:
             # Ensure that we actually remove the entries in the push actions
             # staging area, if we calculated them.
-            run_in_background(
-                self.store.remove_push_actions_from_staging, event.event_id
-            )
+            await self.store.remove_push_actions_from_staging(event.event_id)
             raise
 
     async def _validate_canonical_alias(
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix `Re-starting finished log context PUT-nnnn` warning when event persistence failed.