continuwuation/continuwuity
continuwuation/continuwuity
Watch
18
115
Fork
You've already forked continuwuity
 132
Code Issues 137 Pull requests 44 Releases 42 Packages 3 Activity Actions

Attempt to fix issues with locks throughout the application #2351

Open
Jade wants to merge 10 commits from jade/deadlocks into main
pull from: jade/deadlocks
merge into: continuwuation:main
Conversation 2 Commits 10 Files changed 37 +335 -373
Jade commented 2026-10-12 17:48:50 +00:00
Owner
Copy link
No description provided.
Jade added 10 commits 2026-10-12 17:48:50 +00:00 
Do not hold state.mutex across join_remote_room to prevent an ABBA

deadlock against mutex_federation.
Drop old_room_state_lock and new_room_state_lock before updating

parent spaces and child rooms to prevent multi-room lock inversion.
Reuse the already-held main_lock when checking module staleness

in run() instead of re-acquiring server.mods.read().
Change admin service handle to SyncRwLock and copy the handler

function pointer before awaiting execution to prevent deadlock.
Avoid holding the services.manager lock across manager.start(),

manager.stop(), and manager.poll() async invocations.
Convert pending grants and tickets to SyncMutex and scope locks tightly

before awaiting external calls in grant_info and redeem_token.
Change threepid sessions and send_attempts to SyncMutex and avoid

holding the sessions mutex across callers of get_valid_session.
Replace std::sync::Mutex with parking_lot::Mutex (SyncMutex) in
core::metrics::runtime_intervals. Note that info::introspection retains
std::sync::Mutex because parking_lot panics in dtor after thread locals
are destroyed.
Convert in-memory data structures in appservice, rooms::typing, and sync
wakers to use SyncRwLock and SyncMutex. Drop appservice locks before
making outbound network requests in room alias queries and federation
invites.
refactor(uiaa): Defer uiaa_sessions lock until session insert
Some checks failed
Auto Labeler / Apply labels based on changed files (pull_request_target) Successful in 4s
Details
Checks / Changelog / Check changelog is added (pull_request_target) Failing after 7s
Details
Checks / Prek / Check changed files (pull_request) Successful in 6s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 8m11s
Details
Documentation / Build and Deploy Documentation (pull_request) Successful in 10m39s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Failing after 20m51s
Details
772bfdeb3a
 
Do not hold the uiaa_sessions lock across device lookup in OAuth or
during initial validation. Lock the map only when inserting the newly
created session.
nex requested changes 2026-10-12 20:19:23 +00:00
Dismissed
src/admin/appservice/commands.rs Outdated
@ -80,3 +79,3 @@
.stream_local_users()
.filter_map(async |user_id| {
if self.services.appservice.is_user_id(&user_id).await {
if self.services.appservice.is_user_id(&user_id) {
nex commented 2026-10-12 20:11:56 +00:00
Owner
Copy link

I think this can be refactored into

.ready_filter_map(|user_id| { self.services.appservice.is_user_id(&user_id).then_some(user_id) })
I think this can be refactored into ```rs .ready_filter_map(|user_id| { self.services.appservice.is_user_id(&user_id).then_some(user_id) }) ```
src/admin/mod.rs Outdated
@ -51,3 +47,3 @@
/// Uninstall the admin command handler
pub async fn fini(admin_service: &service::admin::Service) {
_ = admin_service.handle.write().await.take();
_ = admin_service.handle.write().take();
nex commented 2026-10-12 20:12:19 +00:00
Owner
Copy link

init and fini no longer need to be async

`init` and `fini` no longer need to be async
src/api/client/room/upgrade.rs Outdated
Lines 622-623
@ -619,6 +619,9 @@ pub(crate) async fn upgrade_room_route(
.await
.ok();
drop(old_room_state_lock);
drop(new_room_state_lock);
nex commented 2026-10-12 20:14:39 +00:00
Owner
Copy link

These locks are deliberately held until the end of the function from what I can tell? The space upgrade stuff will flake if the room states are mutated while it's in the middle of migrating

These locks are deliberately held until the end of the function from what I can tell? The space upgrade stuff will flake if the room states are mutated while it's in the middle of migrating
Jade commented 2026-10-15 11:06:35 +00:00
Author
Owner
Copy link

One of them shouldn't be acquired in the first place, see like 416, but I'll leave that to you to handle in your lock-free events PR

One of them shouldn't be acquired in the first place, see like 416, but I'll leave that to you to handle in your lock-free events PR
👍 1
nex marked this conversation as resolved
src/service/threepid/mod.rs Outdated
@ -120,65 +121,68 @@ impl Service {
client_secret: &ClientSecret,
send_attempt: usize,
) -> Result<OwnedSessionId> {
let mailer = self.services.mailer.expect_mailer()?;
nex commented 2026-10-12 20:18:49 +00:00
Owner
Copy link

Why was this removed?

Why was this removed?
Jade commented 2026-10-12 21:16:25 +00:00
Author
Owner
Copy link

It wasn't, it was just moved wayyyy down to the bottom of the function

It wasn't, it was just moved wayyyy down to the bottom of the function
nex commented 2026-10-12 21:17:28 +00:00
Owner
Copy link

But doesn't having it right at the start mean we can short-circuit any sort of computational logic? Seems like an anti-optimisation?

But doesn't having it right at the start mean we can short-circuit any sort of computational logic? Seems like an anti-optimisation?
Jade commented 2026-10-12 21:21:37 +00:00
Author
Owner
Copy link

Yeah, probably.

Yeah, probably.
Jade force-pushed jade/deadlocks from 772bfdeb3a
Some checks failed
Auto Labeler / Apply labels based on changed files (pull_request_target) Successful in 4s
Details
Checks / Changelog / Check changelog is added (pull_request_target) Failing after 7s
Details
Checks / Prek / Check changed files (pull_request) Successful in 6s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 8m11s
Details
Documentation / Build and Deploy Documentation (pull_request) Successful in 10m39s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Failing after 20m51s
Details
to 740f9ef0d6
Some checks failed
Checks / Changelog / Check changelog is added (pull_request_target) Failing after 10s
Details
Checks / Prek / Check changed files (pull_request) Successful in 6s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Failing after 1m16s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m26s
Details
Documentation / Build and Deploy Documentation (pull_request) Successful in 10m28s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 8m27s
Details
2026-10-15 10:53:05 +00:00 Compare
Jade force-pushed jade/deadlocks from 740f9ef0d6
Some checks failed
Checks / Changelog / Check changelog is added (pull_request_target) Failing after 10s
Details
Checks / Prek / Check changed files (pull_request) Successful in 6s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Failing after 1m16s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m26s
Details
Documentation / Build and Deploy Documentation (pull_request) Successful in 10m28s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 8m27s
Details
to d9896d7475
Some checks failed
Checks / Changelog / Check changelog is added (pull_request_target) Failing after 6s
Details
Documentation / Build and Deploy Documentation (pull_request) Successful in 1m9s
Details
Checks / Prek / Check changed files (pull_request) Successful in 6s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m12s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
2026-10-15 11:45:43 +00:00 Compare
chore: Changelog
All checks were successful
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 6s
Details
Documentation / Build and Deploy Documentation (pull_request) Successful in 1m8s
Details
Checks / Prek / Check changed files (pull_request) Successful in 6s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m16s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 8m28s
Details
a23c662e71
Jade changed title from WIP: Attempt to fix issues with locks throughout the application to Attempt to fix issues with locks throughout the application 2026-10-15 11:53:15 +00:00
Jade requested reviews from nex, Owners 2026-10-15 11:53:20 +00:00
nex approved these changes 2026-10-15 14:13:50 +00:00
All checks were successful
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 6s
Required
Details
Documentation / Build and Deploy Documentation (pull_request) Successful in 1m8s
Details
Checks / Prek / Check changed files (pull_request) Successful in 6s
Required
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m16s
Required
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 8m28s
Required
Details
This pull request has changes conflicting with the target branch.
  • src/service/rooms/membership/mod.rs
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin jade/deadlocks:jade/deadlocks
git switch jade/deadlocks
Sign in to join this conversation.
Reviewers
No reviewers
nex
Labels
Clear labels   
Abandoned
This pull request appears to be abandoned by its author.

  
Blocked
This pull request or issue is currently blocked from being merged/closed

  
Bug
Something isn't working as intended

  
Changelog
Added
 Changelog entry added

  
Changelog
Missing
 No changelog when one is needed

  
Changelog
None
 Changelog is unnecesary for this change

  
Cherry-picking
Commits picked from other conduit projects

  
Database
This requires or includes changes to the database

  
Dependencies
Something dependency related

  
Dependencies/Renovate
Automatic dependency upgrades by Renovate

  
Difficulty
Easy
 Low difficulty to implement - touches few parts of the codebase, low complexity

  
Difficulty
Hard
 High difficulty to implement - touches many parts of the codebase, high complexity

  
Difficulty
Medium
 Medium difficulty to implement - touches more parts of the codebase, higher complexity

  
Documentation
Improvements or additions to documentation

  
Enhancement
New feature or request

  
Good first issue
Good for newcomers

  
Help wanted
Additional eyes and keyboards are required for this one

  
Inherited
Issues that have been inhereted from the project pre-fork

  
Matrix/Administration
Features pertaining to homeserver administration

  
Matrix/Appservices
Features pertaining to the appservice API

  
Matrix/Auth
Features pertaining to authentication

  
Matrix/Client
Features pertaining to client-to-server interactions

  
Matrix/Core
Issues relating to core matrix functionality, such as state resolution and PDU formats

  
Matrix/E2EE
Issues related to end to end encryption

  
Matrix/Federation
Features pertaining to server-to-server interactions

  
Matrix/Hydra
Issues related to room version 12 and related changes (temporary label)

  
Matrix/MSC
Features pertaining to unstable matrix features

  
Matrix/Media
Features pertaining to media interactions

  
Matrix/T&S
Changes or issues related to trust & safety tooling

  
Merge
This PR is ready to be merged

  
Merge/Manual
This PR should be manually merged

  
Merge/Squash
This PR should be squashed when it is merged

  
Meta
Related to housekeeping, maintenance, or other repo-meta.

  
Meta/CI
Issues related to CI changes

  
Meta/Packaging
Packaging

  
Priority
Blocking
 This issue is blocking the next release

  
Priority
High
 This issue is very important

  
Priority
Low
 This issue is of a rather low priority

  
Security
This item is related to general security

  
Status
Confirmed
 This issue has enough information and is confirmed

  
Status
Duplicate
 This issue or pull request already exists

  
Status
Invalid
 This issue doesn't seem right

  
Status
Needs Investigation
 This issue needs further investigation

  
Support
Questions or support requests

  
bob the builder
pdu logic rewrite starring nexus nicholson

No labels
Abandoned
Blocked
Bug
Changelog
Added
Changelog
Missing
Changelog
None
Cherry-picking
Database
Dependencies
Dependencies/Renovate
Difficulty
Easy
Difficulty
Hard
Difficulty
Medium
Documentation
Enhancement
Good first issue
Help wanted
Inherited
Matrix/Administration
Matrix/Appservices
Matrix/Auth
Matrix/Client
Matrix/Core
Matrix/E2EE
Matrix/Federation
Matrix/Hydra
Matrix/MSC
Matrix/Media
Matrix/T&S
Merge
Merge/Manual
Merge/Squash
Meta
Meta/CI
Meta/Packaging
Priority
Blocking
Priority
High
Priority
Low
Security
Status
Confirmed
Status
Duplicate
Status
Invalid
Status
Needs Investigation
Support
bob the builder
Milestone
Clear milestone
No items
No milestone
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
continuwuation/continuwuity!2351
No description provided.