Skip to content

fix: keep one subscription when first subscribes race - #4944

Merged
boks1971 merged 2 commits into
masterfrom
raja/subscribe-insert-if-absent
Oct 5, 2026
Merged

boks1971 merged 2 commits into
masterfrom
raja/subscribe-insert-if-absent

Conversation

@boks1971

@boks1971 boks1971 commented Oct 5, 2026 •

Copy link
Copy Markdown
Contributor

Find or create a track subscription and set it as desired under one lock.

SubscribeToTrack looked up the subscription, and if there was none, it created one and stored it under a separate lock. SubscribeToDataTrack did the same. Two first subscribes that ran at the same time could each store their own entry, and the second one replaced the first.

The replaced entry could still be reconciled and add a down track. After that, nothing owned the down track, and the kept entry tried to subscribe again. A settings update that ran at the same time could also put the settings on the replaced entry, so the down track never got them.

Now the lookup, the create and setDesired(true) run under one m.lock. This also stops the cleanup pass from removing a new entry before it is marked as desired. The lock order is the same as before (manager lock, then subscription lock).

TestConcurrentFirstSubscribe runs two subscribes and one settings update at the same time, 200 times. It checks that the kept subscription owns the down track and that the down track got the settings. On master it fails within the 200 rounds.

Two more cases are fixed in the same code:

  • A settings or options update before the first subscribe creates an entry that is not desired. Cleanup removed that entry on its next pass, so the subscribe made a new entry without the settings. The entry is now kept for notFoundTimeout (1 minute) after the update.
  • After a data track unsubscribe, the entry was deleted even if a subscribe set it as desired during the removal, and the client stayed unsubscribed. It is now deleted only if it is still not desired, and otherwise it is reconciled again.

Cleanup also deletes only the entry that it checked. TestSettingsKeptForSubscribe and the "subscribe again during unsubscribe" case in TestSubscribeDataTrack fail on master.

🤖 Generated with Claude Code

SubscribeToTrack and SubscribeToDataTrack looked up the subscription,
then created one and stored it under a separate lock. Two concurrent
first subscribes, or a subscribe and a settings update, could each
store their own entry. The replaced entry could still add the down
track, which nothing owned after that, and the settings could land on
the replaced entry.

Find or create the subscription and set it as desired under one lock.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
devin-ai-integration[bot]

This comment was marked as resolved.

A settings or options update before the first subscribe creates an
entry that is not desired. Cleanup removed it on the next pass, so the
subscribe created a new entry without the settings. Keep such an entry
for notFoundTimeout.

After a data track unsubscribe, the entry was deleted even if a
subscribe set it as desired during the removal. Delete it only if it
is still not desired, else reconcile it again.

Cleanup deletes only the entry it checked.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@boks1971
boks1971 merged commit 6816ccd into master Oct 5, 2026
6 checks passed
@boks1971
boks1971 deleted the raja/subscribe-insert-if-absent branch October 5, 2026 19:28
eleboucher pushed a commit to eleboucher/homelab that referenced this pull request Oct 7, 2026
…7 ➔ v1.13.8) (#2275)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [docker.io/livekit/livekit-server](https://github.com/livekit/livekit) | patch | `v1.13.7` → `v1.13.8` |

---

### Release Notes

<details>
<summary>livekit/livekit (docker.io/livekit/livekit-server)</summary>

### [`v1.13.8`](https://github.com/livekit/livekit/releases/tag/v1.13.8)

[Compare Source](livekit/livekit@v1.13.7...v1.13.8)

##### Added

- agent: HTTP endpoints data plane ([#&#8203;4779](livekit/livekit#4779))
- use sender report pass through setting to forward abs-capture-time verbatim ([#&#8203;4812](livekit/livekit#4812))
- Add sdk lable to session start time and participant join ([#&#8203;4885](livekit/livekit#4885))
- Add a local participant method to get recently disconnected ([#&#8203;4911](livekit/livekit#4911))
- service: start room composite egress configured in a room preset ([#&#8203;4926](livekit/livekit#4926))

##### Changed

- Update github workflows ([#&#8203;4446](livekit/livekit#4446))
- Reduce descriptor marshal allocations on Go 1.26.4/linux-amd64 ([#&#8203;4681](livekit/livekit#4681))
- config: reject unknown send\_side\_bwe\_pacer, warn on unwired fallback ([#&#8203;4804](livekit/livekit#4804))
- Update github.com/livekit/protocol digest to [`a879e94`](livekit/livekit@a879e94) ([#&#8203;4864](livekit/livekit#4864))
- Update module github.com/gotesttools/gotestfmt/v2 to v2.5.0 ([#&#8203;4865](livekit/livekit#4865))
- Update module github.com/urfave/cli/v3 to v3.11.0 ([#&#8203;4867](livekit/livekit#4867))
- Update module golang.org/x/mod to v0.41.0 ([#&#8203;4868](livekit/livekit#4868))
- sfu: return VP8 munged header by value to avoid per-packet allocation ([#&#8203;4871](livekit/livekit#4871))
- sfu: patch pacer header extensions without per-packet allocation ([#&#8203;4872](livekit/livekit#4872))
- Update pion/sdp to get lesser SDP retention ([#&#8203;4873](livekit/livekit#4873))
- sfu: skip pacer allocation assertion under the race detector ([#&#8203;4874](livekit/livekit#4874))
- sfu: broadcast RTP to down tracks without per-packet allocations ([#&#8203;4875](livekit/livekit#4875))
- Track action versions and stop quarantining our own actions ([#&#8203;4877](livekit/livekit#4877))
- test: fix two data races in the test suites ([#&#8203;4878](livekit/livekit#4878))
- Bump go.opentelemetry.io/otel/sdk ([#&#8203;4879](livekit/livekit#4879))
- deps: update psrpc to v0.8.0 ([#&#8203;4882](livekit/livekit#4882))
- Update module github.com/moby/moby/client to v0.6.0 ([#&#8203;4883](livekit/livekit#4883))
- Update module golang.org/x/sync to v0.23.0 ([#&#8203;4884](livekit/livekit#4884))
- Propagate SIP\_TRUNK\_FAILURE ([#&#8203;4890](livekit/livekit#4890))
- ccutils: use millisecond resolution for probe interval backoff ([#&#8203;4891](livekit/livekit#4891))
- Increase receiver loadbalance threshold when batch io enabled ([#&#8203;4899](livekit/livekit#4899))
- rtc: parse each remote offer once per negotiation ([#&#8203;4904](livekit/livekit#4904))
- Bump protocol ([#&#8203;4909](livekit/livekit#4909))
- rtc: split EndSession out of MoveToRoom ([#&#8203;4917](livekit/livekit#4917))
- telemetry: drop the stats worker re-key path ([#&#8203;4918](livekit/livekit#4918))
- sfu: report forwarding latency as p90 instead of the mean ([#&#8203;4920](livekit/livekit#4920))
- rtc: accept ICE Completed in ICE-restart connect assertions ([#&#8203;4921](livekit/livekit#4921))
- rtc: measure data blob keys by their content, not their text form ([#&#8203;4923](livekit/livekit#4923))
- Remove deprecatred way of setting prometheus from the config file ([#&#8203;4928](livekit/livekit#4928))
- test: give mock participants a connection quality, close test rooms ([#&#8203;4933](livekit/livekit#4933))
- update warp dep ([#&#8203;4943](livekit/livekit#4943))

##### Fixed

- Do not add down tracks after receiver close ([#&#8203;4857](livekit/livekit#4857))
- Do not request media sections for transceivers that cannot send ([#&#8203;4892](livekit/livekit#4892))
- Deregister agent job when the server terminates it ([#&#8203;4893](livekit/livekit#4893))
- sfu: don't hold bindLock across the blank-frame flush in CloseWithFlush ([#&#8203;4895](livekit/livekit#4895))
- dynacast: re-send subscribed qualities after every publisher answer ([#&#8203;4907](livekit/livekit#4907))
- agent: release JobTerminate handler when job ends before registration ([#&#8203;4908](livekit/livekit#4908))
- Report disconnected for older disconnected participants. ([#&#8203;4910](livekit/livekit#4910))
- rtc: record a room's departure when the participant leaves it ([#&#8203;4913](livekit/livekit#4913))
- update deps to fix warp issue ([#&#8203;4916](livekit/livekit#4916))
- sfu: fix data stats active window bitrate and duration units ([#&#8203;4922](livekit/livekit#4922))
- fix: reject instead of drop for no dispatch rule ([#&#8203;4927](livekit/livekit#4927))
- fix: skip RTX/FEC when picking a fallback video codec ([#&#8203;4930](livekit/livekit#4930))
- fix: do not read invalid delta ([#&#8203;4935](livekit/livekit#4935))
- fix: use the fast debounce for the first negotiation ([#&#8203;4936](livekit/livekit#4936))
- fix: skip DTLS HelloVerifyRequest ([#&#8203;4937](livekit/livekit#4937))
- config: parse generated duration flags as durations ([#&#8203;4939](livekit/livekit#4939))
- fix: use the most common recent packet rate in connection quality ([#&#8203;4940](livekit/livekit#4940))
- fix: copy RED history packets instead of keeping pointers ([#&#8203;4941](livekit/livekit#4941))
- fix: keep one subscription when first subscribes race ([#&#8203;4944](livekit/livekit#4944))
- bump protocol to get unlock on no key fix ([#&#8203;4945](livekit/livekit#4945))
- fix: count leftover upstream loss after RTX repairs ([#&#8203;4946](livekit/livekit#4946))
- fix: switch VP8 temporal layer up only at a layer sync frame ([#&#8203;4947](livekit/livekit#4947))
- fix: reconcile everything when the reconcile queue overflows ([#&#8203;4948](livekit/livekit#4948))
- fix: enable H.264 publish for desktop Linux Firefox ([#&#8203;4949](livekit/livekit#4949))

</details>

---

### Configuration

📅 **Schedule**: (UTC)

- Branch creation
  - At any time (no schedule defined)
- Automerge
  - At any time (no schedule defined)

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Mend Renovate CLI](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0NC4xMzMuMCIsInVwZGF0ZWRJblZlciI6IjQ0LjEzMy4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->

Reviewed-on: https://git.erwanleboucher.dev/eleboucher/homelab/pulls/2275
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants