Skip to content

Fix RPC invocation race condition #565

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
bcherry merged 8 commits into from
Feb 4, 2025
Merged

Fix RPC invocation race condition #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
90a1a08
Fix race condition in rpc invocation
bcherry Feb 4, 2025
18358b5
Merge remote-tracking branch 'origin/main' into bcherry/rpc-invoke-race
bcherry Feb 4, 2025
ba4e8d4
nanpa
bcherry Feb 4, 2025
7a03d88
Merge remote-tracking branch 'origin/bcherry/rpc-invoke-race' into bc…
bcherry Feb 4, 2025
a334958
fix
bcherry Feb 4, 2025
b8484ec
nanpa
bcherry Feb 4, 2025
69eb81d
cgo
bcherry Feb 4, 2025
8e8706f
sm
bcherry Feb 4, 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 .nanpa/rpc-race.kdl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
patch package="livekit-ffi" type="fixed" "Fix RPC invocation race bug"
4 changes: 2 additions & 2 deletions livekit-ffi/src/server/participant.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ async fn forward_rpc_method_invocation(
let (tx, rx) = oneshot::channel();
let invocation_id = server.next_id();

room.store_rpc_method_invocation_waiter(invocation_id, tx);

let _ = server.send_event(proto::ffi_event::Message::RpcMethodInvocation(
proto::RpcMethodInvocationEvent {
local_participant_handle: local_participant_handle as u64,
Expand All @@ -152,8 +154,6 @@ async fn forward_rpc_method_invocation(
},
));

room.store_rpc_method_invocation_waiter(invocation_id, tx);

rx.await.unwrap_or_else(|_| {
Err(RpcError {
code: RpcErrorCode::ApplicationError as u32,
Expand Down