Skip to content
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

Fix deadlock in subscriber undeclaration #1649

Merged
merged 4 commits into from
Dec 10, 2024
Merged

Fix deadlock in subscriber undeclaration #1649

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
59c04bf
Fix deadlock
oteffahi Dec 10, 2024
86fcca0
Only update matching listener status for last remote subscriber
oteffahi Dec 10, 2024
80a740f
Remove unnecessary drop after changes
oteffahi Dec 10, 2024
f90245a
Add unit test for undeclare deadlock
oteffahi Dec 10, 2024
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
30 changes: 20 additions & 10 deletions zenoh/src/api/session.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1574,19 +1574,29 @@ impl SessionInner {
},
}),
});
#[cfg(feature = "unstable")]
{
let state = zread!(self.state);
self.update_matching_status(
&state,
&sub_state.key_expr,
MatchingStatusType::Subscribers,
false,
)
}
}
} else {
drop(state);
}
#[cfg(feature = "unstable")]
{
let state = zread!(self.state);
self.update_matching_status(
&state,
&sub_state.key_expr,
MatchingStatusType::Subscribers,
false,
)
#[cfg(feature = "unstable")]
{
let state = zread!(self.state);
self.update_matching_status(
&state,
&sub_state.key_expr,
MatchingStatusType::Subscribers,
false,
)
}
}
}
SubscriberKind::LivelinessSubscriber => {
Expand Down
12 changes: 12 additions & 0 deletions zenoh/tests/session.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,3 +430,15 @@ async fn zenoh_session_close_in_background() {
};
ztimeout!(close_all);
}

#[cfg(feature = "unstable")]
#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
async fn test_undeclare_subscribers_same_keyexpr() {
let key_expr = "test/undeclare/subscribers";
let session = zenoh::open(zenoh::Config::default()).await.unwrap();
let sub1 = session.declare_subscriber(key_expr).await.unwrap();
let sub2 = session.declare_subscriber(key_expr).await.unwrap();
tokio::time::sleep(SLEEP).await;
ztimeout!(sub1.undeclare()).unwrap();
ztimeout!(sub2.undeclare()).unwrap();
}
Loading