Skip to content

Commit

Permalink
Merge branch 'main' into flaky-local-swarm-discovery
Browse files Browse the repository at this point in the history
  • Loading branch information
@ramfox
ramfox authored Aug 2, 2024
2 parents 6486d82 + d662bfc commit 3e859ef
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 27 deletions.
25 changes: 2 additions & 23 deletions iroh-net/src/magicsock/node_map/best_addr.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@ use std::{
time::{Duration, Instant},
};

use iroh_metrics::inc;
use tracing::{debug, info};

use crate::magicsock::metrics::Metrics as MagicsockMetrics;

/// How long we trust a UDP address as the exclusive path (without using relay) without having heard a Pong reply.
const TRUST_UDP_ADDR_DURATION: Duration = Duration::from_millis(6500);

Expand Down Expand Up @@ -93,12 +90,6 @@ impl BestAddr {
let old = self.0.take();
if let Some(old_addr) = old.as_ref().map(BestAddrInner::addr) {
info!(?reason, ?has_relay, %old_addr, "clearing best_addr");
// no longer relying on the direct connection
inc!(MagicsockMetrics, num_direct_conns_removed);
if has_relay {
// we are now relying on the relay connection, add a relay conn
inc!(MagicsockMetrics, num_relay_conns_added);
}
}
}

Expand Down Expand Up @@ -126,16 +117,15 @@ impl BestAddr {
latency: Duration,
source: Source,
confirmed_at: Instant,
has_relay: bool,
) {
match self.0.as_mut() {
None => {
self.insert(addr, latency, source, confirmed_at, has_relay);
self.insert(addr, latency, source, confirmed_at);
}
Some(state) => {
let candidate = AddrLatency { addr, latency };
if !state.is_trusted(confirmed_at) || candidate.is_better_than(&state.addr) {
self.insert(addr, latency, source, confirmed_at, has_relay);
self.insert(addr, latency, source, confirmed_at);
} else if state.addr.addr == addr {
state.confirmed_at = confirmed_at;
state.trust_until = Some(source.trust_until(confirmed_at));
Expand All @@ -160,7 +150,6 @@ impl BestAddr {
latency: Duration,
source: Source,
confirmed_at: Instant,
has_relay: bool,
) {
let trust_until = source.trust_until(confirmed_at);

Expand All @@ -184,22 +173,12 @@ impl BestAddr {
"selecting new direct path for node"
);
}
let was_empty = self.is_empty();
let inner = BestAddrInner {
addr: AddrLatency { addr, latency },
trust_until: Some(trust_until),
confirmed_at,
};
self.0 = Some(inner);
if was_empty && has_relay {
// we now have a direct connection, adjust direct connection count
inc!(MagicsockMetrics, num_direct_conns_added);
if has_relay {
// we no longer rely on the relay connection, decrease the relay connection
// count
inc!(MagicsockMetrics, num_relay_conns_removed);
}
}
}

pub fn state(&self, now: Instant) -> State {
Expand Down
50 changes: 46 additions & 4 deletions iroh-net/src/magicsock/node_map/node_state.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,15 +295,59 @@ impl NodeState {
(None, Some(relay_url)) => ConnectionType::Relay(relay_url),
(None, None) => ConnectionType::None,
};
if self.conn_type.update(typ).is_ok() {
let typ = self.conn_type.get();
if let Ok(prev_typ) = self.conn_type.update(typ.clone()) {
// The connection type has changed.
event!(
target: "events.net.conn_type.changed",
Level::DEBUG,
node = %self.node_id.fmt_short(),
conn_type = ?typ,
);
info!(%typ, "new connection type");

// Update some metrics
match (prev_typ, typ) {
(ConnectionType::Direct(_), ConnectionType::Direct(_)) => (),
(ConnectionType::Direct(_), ConnectionType::Relay(_)) => {
inc!(MagicsockMetrics, num_direct_conns_removed);
inc!(MagicsockMetrics, num_relay_conns_added);
}
(ConnectionType::Direct(_), ConnectionType::Mixed(_, _)) => {
inc!(MagicsockMetrics, num_direct_conns_removed);
inc!(MagicsockMetrics, num_relay_conns_added);
}
(ConnectionType::Direct(_), ConnectionType::None) => {
inc!(MagicsockMetrics, num_direct_conns_removed)
}
(ConnectionType::Relay(_), ConnectionType::Direct(_)) => {
inc!(MagicsockMetrics, num_direct_conns_added);
inc!(MagicsockMetrics, num_relay_conns_removed);
}
(ConnectionType::Relay(_), ConnectionType::Relay(_)) => (),
(ConnectionType::Relay(_), ConnectionType::Mixed(_, _)) => (),
(ConnectionType::Relay(_), ConnectionType::None) => {
inc!(MagicsockMetrics, num_relay_conns_removed)
}
(ConnectionType::Mixed(_, _), ConnectionType::Direct(_)) => {
inc!(MagicsockMetrics, num_direct_conns_added);
inc!(MagicsockMetrics, num_relay_conns_removed);
}
(ConnectionType::Mixed(_, _), ConnectionType::Relay(_)) => (),
(ConnectionType::Mixed(_, _), ConnectionType::Mixed(_, _)) => (),
(ConnectionType::Mixed(_, _), ConnectionType::None) => {
inc!(MagicsockMetrics, num_relay_conns_removed)
}
(ConnectionType::None, ConnectionType::Direct(_)) => {
inc!(MagicsockMetrics, num_direct_conns_added)
}
(ConnectionType::None, ConnectionType::Relay(_)) => {
inc!(MagicsockMetrics, num_relay_conns_added)
}
(ConnectionType::None, ConnectionType::Mixed(_, _)) => {
inc!(MagicsockMetrics, num_relay_conns_added)
}
(ConnectionType::None, ConnectionType::None) => (),
}
}
(best_addr, relay_url)
}
Expand Down Expand Up @@ -367,7 +411,6 @@ impl NodeState {
pong.latency,
best_addr::Source::BestCandidate,
pong.pong_at,
self.relay_url.is_some(),
)
}
}
Expand Down Expand Up @@ -916,7 +959,6 @@ impl NodeState {
latency,
best_addr::Source::ReceivedPong,
now,
self.relay_url.is_some(),
);
}

Expand Down

0 comments on commit 3e859ef

Please sign in to comment.