Fix RetryDestinationLimiter re-starting finished log contexts

Signed-off-by: Sean Quah <[email protected]>
matrix-org · May 19, 2022 · fad085d · fad085d
1 parent 96df312
commit fad085d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/changelog.d/12803.bugfix b/changelog.d/12803.bugfix
@@ -0,0 +1 @@
+Fix a long-standing bug where finished log contexts would be re-started when failing to contact remote homeservers.
diff --git a/synapse/util/retryutils.py b/synapse/util/retryutils.py
@@ -16,8 +16,8 @@
 from types import TracebackType
 from typing import TYPE_CHECKING, Any, Optional, Type
 
-import synapse.logging.context
 from synapse.api.errors import CodeMessageException
+from synapse.metrics.background_process_metrics import run_as_background_process
 from synapse.storage import DataStore
 from synapse.util import Clock
 
@@ -265,4 +265,6 @@ async def store_retry_timings() -> None:
                 logger.exception("Failed to store destination_retry_timings")
 
         # we deliberately do this in the background.
-        synapse.logging.context.run_in_background(store_retry_timings)
+        run_as_background_process(
+            f"store_retry_timings-{self.destination}", store_retry_timings
+        )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix a long-standing bug where finished log contexts would be re-started when failing to contact remote homeservers.