Repository navigation
fix(rtc): create the FfiClient singleton under a lock - #918
Merged
Merged
Conversation
Two threads that read FfiClient.instance at the same time each created their own client, and FFI events reached only one of their queues. A Room.connect() listening on the other queue never sent ReadyForRoomEventRequest, so the FFI server panicked after 15 s and the process exited with every room in it. Fixes livekit/agents#7545.
longcw
marked this pull request as ready for review
November 3, 2026 06:28
longcw
requested review from
changt,
cloudwebrtc,
lukasIO and
xianshijing-lk
as code owners
November 3, 2026 06:28
lukasIO
approved these changes
Nov 4, 2026
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem: Two threads that read
FfiClient.instanceat the same time each create their ownFfiClient, and FFI events reach only the queue of the last one. ARoom.connect()that listens on the other queue never sendsReadyForRoomEventRequest, so after 15 s the FFI server panics and the process exits with every room in it.Fix:
FfiClient.instancereturns an existing client without a lock, and creates a new one only under a class-level lock that checks_instanceagain. Every thread gets the same client, so every connect callback reaches its caller.Fixes livekit/agents#7545.
Context for reviewing and coding agents