Skip to content

Fix potential lost logcontext when PerDestinationQueue.shutdown(...) #19178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MadLittleMods merged 4 commits into from
Nov 13, 2025
Merged

Fix potential lost logcontext when PerDestinationQueue.shutdown(...) #19178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d886eb8
Fix potential lost logcontext when `PerDestinationQueue.shutdown(...)`
MadLittleMods Nov 13, 2025
ea291ad
Add changelog
MadLittleMods Nov 13, 2025
a281419
Merge branch 'develop' into madlittlemods/lost-logcontext-per-destina…
MadLittleMods Nov 13, 2025
f586ffa
Merge branch 'develop' into madlittlemods/lost-logcontext-per-destina…
MadLittleMods Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/19178.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix potential lost logcontext when `PerDestinationQueue.shutdown(...)`.
4 changes: 3 additions & 1 deletion synapse/federation/sender/per_destination_queue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
from synapse.federation.units import Edu
from synapse.handlers.presence import format_user_presence_state
from synapse.logging import issue9533_logger
from synapse.logging.context import PreserveLoggingContext
from synapse.logging.opentracing import SynapseTags, set_tag
from synapse.metrics import SERVER_NAME_LABEL, sent_transactions_counter
from synapse.types import JsonDict, ReadReceipt
Expand Down Expand Up @@ -186,7 +187,8 @@ def shutdown(self) -> None:
self._transaction_manager.shutdown()
try:
if self.active_transmission_loop is not None:
self.active_transmission_loop.cancel()
with PreserveLoggingContext():
self.active_transmission_loop.cancel()
Comment on lines +190 to +191
Copy link
Copy Markdown
Contributor Author

@MadLittleMods MadLittleMods Nov 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To explain the fix, see the Deferred callbacks section of our logcontext docs for more info (specifically using solution 2).

Heads-up, I wrote the docs too so it's my assumptions/understanding all the way down. Apply your own scrutiny.

except Exception:
pass

Expand Down
Loading
⚡