Merge commit '53834bb9c' into anoa/dinsic_release_1_21_x

* commit '53834bb9c':
  Run `remove_push_actions_from_staging` in foreground (#8081)

2 files changed, 2 insertions, 3 deletions

diff --git a/changelog.d/8081.bugfix b/changelog.d/8081.bugfix
new file mode 100644

index 0000000000..9ebcbf5b84
--- /dev/null
+++ 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

index b0f025fab2..e7a07967d8 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -894,9 +894,7 @@ class EventCreationHandler(object):
         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(