Skip to content

ts_runtime: wait to build routes until derp map is populated #282

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

Open
dylan-tailscale wants to merge 2 commits into
base: main
Choose a base branch
from
Open

ts_runtime: wait to build routes until derp map is populated #282

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9c3f80
ts_runtime: wait to build routes until derp map is populated
dylan-tailscale Jul 15, 2026
20a632b
ts_runtime: is_initialized -> seen_derp
dylan-tailscale Jul 16, 2026
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
23 changes: 15 additions & 8 deletions ts_runtime/src/route_updater.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ pub struct RouteUpdater {
derp_transport_map: DerpTransportMap,
peer_state: Arc<PeerState>,
env: Env,
/// Prevents building routes until the first `DerpTransportMap` has been processed.
is_initialized: bool,

@nrc nrc Jul 16, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could derp_transport_map be an Option rather than adding a bool here?

@dylan-tailscale dylan-tailscale Jul 16, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was my original approach, but all the self.derp_transport_map ref sites went from self.derp_transport_map.0.get(...) to self.derp_transport_map.as_ref().unwrap().0.get(...), which felt...overly complex/boilerplate-ish? I don't think the extra bool on RouteUpdater matters perf-wise, but if I'm being too precious here and Option<DerpTransportMap> is the more idiomatic approach (or if I'm missing something else), happy to change it!

@npry npry Jul 16, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Separate point: perhaps call this seen_derp or similar? This isn't the unique thing that decides that this actor is done initializing, the peer state is equally important imo (it just happens to not cause this logging issue)

@dylan-tailscale dylan-tailscale Jul 16, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@npry good point, renamed to seen_derp - still open to moving to Option<> if that's better though.

}

impl RouteUpdater {
Expand All @@ -26,8 +28,11 @@ impl RouteUpdater {
"reconstructing routes for peer update"
);

let mut overlay_out = ts_bart::Table::default();
let mut underlay_out = HashMap::default();
let mut routes = PeerRoutesInner::default();
if !self.is_initialized {
tracing::debug!("not building routes, derp map unpopulated");
return routes;
}

for (id, peer) in self.peer_state.peers.peers() {
let span = tracing::trace_span!(
Expand All @@ -46,7 +51,7 @@ impl RouteUpdater {
match self.derp_transport_map.0.get(&region) {
Some(&transport_id) => {
span.record("underlay_transport", tracing::field::debug(transport_id));
underlay_out.insert(*id, transport_id);
routes.underlay_routes.insert(*id, transport_id);
}
None => {
tracing::error!("no region stored in multiderp, no underlay route");
Expand All @@ -56,14 +61,13 @@ impl RouteUpdater {
tracing::trace!(routes = ?peer.accepted_routes);

for route in &peer.accepted_routes {
overlay_out.insert(*route, OutboundRouteAction::Wireguard(*id));
routes
.overlay_out_routes
.insert(*route, OutboundRouteAction::Wireguard(*id));
}
}

PeerRoutesInner {
underlay_routes: underlay_out,
overlay_out_routes: overlay_out,
}
routes
}
}

Expand All @@ -86,6 +90,7 @@ impl kameo::Actor for RouteUpdater {
derp_transport_map: DerpTransportMap::default(),
peer_state: Default::default(),
env,
is_initialized: false,
})
}
}
Expand All @@ -100,6 +105,7 @@ pub struct PeerRouteUpdate {
pub inner: Arc<PeerRoutesInner>,
}

#[derive(Default)]
pub struct PeerRoutesInner {
pub underlay_routes: HashMap<PeerId, UnderlayTransportId>,
pub overlay_out_routes: ts_bart::Table<OutboundRouteAction>,
Expand Down Expand Up @@ -136,6 +142,7 @@ impl Message<DerpTransportMap> for RouteUpdater {
tracing::debug!("derp transport map changed, building new routes");

self.derp_transport_map = msg;
self.is_initialized = true;

let new_routes = self.build_routes();
if let Err(e) = self
Expand Down