Merge commit '53834bb9c' into anoa/dinsic_release_1_21_x

anoadragon453 · anoadragon453 · commit 48a182c01074 · 2020-10-19T18:24:46.000+01:00
* commit '53834bb9c': Run `remove_push_actions_from_staging` in foreground (#8081)
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
@@ -894,9 +894,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 @@`
	`1`	+Fix `Re-starting finished log context PUT-nnnn` warning when event persistence failed.