Skip to content

(Bitcraft) Deadlock fix: scope down subscription lock in remove_single_subscription #5671

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

Closed
Shubham8287 wants to merge 1 commit into from
Closed

(Bitcraft) Deadlock fix: scope down subscription lock in remove_single_subscription #5671

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 9 additions & 7 deletions crates/core/src/subscription/module_subscription_actor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,14 +609,16 @@ impl ModuleSubscriptions {
)
};

let mut subscriptions = self.subscriptions.write();
let queries = {
let mut subscriptions = self.subscriptions.write();
return_on_err!(
subscriptions.remove_subscription((sender.id.identity, sender.id.connection_id), request.query_id),
// Apparently we ignore errors sending messages.
send_err_msg,
None
)
};

let queries = return_on_err!(
subscriptions.remove_subscription((sender.id.identity, sender.id.connection_id), request.query_id),
// Apparently we ignore errors sending messages.
send_err_msg,
None
);
// This is technically a bug, since this could be empty if the client has another duplicate subscription.
// This whole function should be removed soon, so I don't think we need to fix it.
let [query] = &*queries else {
Expand Down
Loading