Fix potential lost logcontext when PerDestinationQueue.shutdown(...)#19178
Merged
MadLittleMods merged 4 commits intodevelopfrom Nov 13, 2025
Merged
Conversation
MadLittleMods
commented
Nov 13, 2025
Comment on lines
+190
to
+191
| with PreserveLoggingContext(): | ||
| self.active_transmission_loop.cancel() |
Contributor
Author
There was a problem hiding this comment.
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.
…tion-queue-shutdown
…tion-queue-shutdown
devonh
approved these changes
Nov 13, 2025
Member
devonh
left a comment
There was a problem hiding this comment.
Based on my understanding, and your docs this change makes sense to me.
Though I agree it shouldn't fix the issue reported as normal Synapse usage never calls shutdown.
Contributor
Author
|
Thanks for the review @devonh 🐄 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix potential lost logcontext when
PerDestinationQueue.shutdown(...)Spawning from looking at the logs in #19165 (comment) which mention the
federation_transaction_transmission_loop. I don't think it's the source of the lost logcontext that person in the issue is experiencing because this only applies when you try toshutdownthe homeserver.Problem code introduced in #18828
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.
Pull Request Checklist
EventStoretoEventWorkerStore.".code blocks.