Skip to content

Fix reconnection logic to not exhaust retries prematurely #785

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

Closed
wants to merge 2 commits into from
+7 −5
Closed

Fix reconnection logic to not exhaust retries prematurely #785

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71e336d
Change iterations to start from 1 to improve the message: "attempt 0"
TomaszMysliwiec Nov 15, 2025
63a8e1c
Change reconnecting interval to use MissedTickBehavior::Delay to not …
TomaszMysliwiec Nov 15, 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
12 changes: 7 additions & 5 deletions livekit/src/rtc_engine/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use std::{borrow::Cow, fmt::Debug, sync::Arc, time::Duration};
use libwebrtc::prelude::*;
use livekit_api::signal_client::{SignalError, SignalOptions};
use livekit_protocol as proto;
use livekit_runtime::{interval, Interval, JoinHandle};
use livekit_runtime::{interval, Interval, JoinHandle, MissedTickBehavior};
use parking_lot::{RwLock, RwLockReadGuard};
use thiserror::Error;
use tokio::sync::{
Expand Down Expand Up @@ -360,6 +360,8 @@ impl EngineInner {
session.wait_pc_connection().await?;

let (engine_tx, engine_rx) = mpsc::unbounded_channel();
let mut interval = interval(RECONNECT_INTERVAL);
interval.set_missed_tick_behavior(MissedTickBehavior::Delay);
let inner = Arc::new(Self {
lk_runtime,
engine_tx,
Expand All @@ -374,7 +376,7 @@ impl EngineInner {
}),
options,
reconnecting_lock: AsyncRwLock::default(),
reconnecting_interval: AsyncMutex::new(interval(RECONNECT_INTERVAL)),
reconnecting_interval: AsyncMutex::new(interval),
});

// Start initial tasks
Expand Down Expand Up @@ -722,7 +724,7 @@ impl EngineInner {
)
};

for i in 0..RECONNECT_ATTEMPTS {
for i in 1..=RECONNECT_ATTEMPTS {
let (is_closed, full_reconnect) = {
let running_handle = self.running_handle.read();
(running_handle.closed, running_handle.full_reconnect)
Expand All @@ -733,7 +735,7 @@ impl EngineInner {
}

if full_reconnect {
if i == 0 {
if i == 1 {
let (tx, rx) = oneshot::channel();
let _ = self.engine_tx.send(EngineEvent::Restarting(tx));
let _ = rx.await;
Expand All @@ -757,7 +759,7 @@ impl EngineInner {
return Ok(());
}
} else {
if i == 0 {
if i == 1 {
let (tx, rx) = oneshot::channel();
let _ = self.engine_tx.send(EngineEvent::Resuming(tx));
let _ = rx.await;
Expand Down