Skip to content

fix the RPC race condition #865

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
xianshijing-lk merged 1 commit into from
Feb 5, 2026
Merged

fix the RPC race condition #865

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
25 changes: 15 additions & 10 deletions livekit/src/room/participant/local_participant.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,7 +799,15 @@ impl LocalParticipant {
min_effective_timeout,
);

match self
// Register channels BEFORE sending the request to avoid race condition
// where the response arrives before we've registered the handlers
{
let mut rpc_state = self.local.rpc_state.lock();
rpc_state.pending_acks.insert(id.clone(), ack_tx);
rpc_state.pending_responses.insert(id.clone(), response_tx);
}

if let Err(e) = self
.publish_rpc_request(RpcRequest {
destination_identity: data.destination_identity.clone(),
id: id.clone(),
Expand All @@ -810,15 +818,12 @@ impl LocalParticipant {
})
.await
{
Ok(_) => {
let mut rpc_state = self.local.rpc_state.lock();
rpc_state.pending_acks.insert(id.clone(), ack_tx);
rpc_state.pending_responses.insert(id.clone(), response_tx);
}
Err(e) => {
log::error!("Failed to publish RPC request: {}", e);
return Err(RpcError::built_in(RpcErrorCode::SendFailed, Some(e.to_string())));
}
// Clean up on failure
let mut rpc_state = self.local.rpc_state.lock();
rpc_state.pending_acks.remove(&id);
rpc_state.pending_responses.remove(&id);
log::error!("Failed to publish RPC request: {}", e);
return Err(RpcError::built_in(RpcErrorCode::SendFailed, Some(e.to_string())));
}

// Wait for ack timeout
Expand Down
Loading