suhoan/EasyTier
1
0
Fork 0
mirror of https://mirror.suhoan.cn/https://github.com/EasyTier/EasyTier.git synced 2025-12-14 05:37:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

optimize pingpong conn close condition (#549)

Browse Source 
if received some packets from peer, only close conn after enough
rounds of pingpong
This commit is contained in:
Sijie.Sun
2025-01-07 22:42:57 +08:00
committed by GitHub
parent a4419a31fd
commit e016aeddeb
2 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
easytier/src/peers/peer_conn.rs
View File

@@ -484,13 +484,6 @@ mod tests {
let c_recorder = Arc::new(DropSendTunnelFilter::new(drop_start, drop_end)); let c_recorder = Arc::new(DropSendTunnelFilter::new(drop_start, drop_end));
let c = TunnelWithFilter::new(c, c_recorder.clone()); let c = TunnelWithFilter::new(c, c_recorder.clone());
let s = if drop_both {
let s_recorder = Arc::new(DropSendTunnelFilter::new(drop_start, drop_end));
Box::new(TunnelWithFilter::new(s, s_recorder.clone()))
} else {
s
};
let c_peer_id = new_peer_id(); let c_peer_id = new_peer_id();
let s_peer_id = new_peer_id(); let s_peer_id = new_peer_id();
@@ -506,6 +499,7 @@ mod tests {
s_peer s_peer
.start_recv_loop(tokio::sync::mpsc::channel(200).0) .start_recv_loop(tokio::sync::mpsc::channel(200).0)
.await; .await;
// do not start ping for s, s only reponde to ping from c
assert!(c_ret.is_ok()); assert!(c_ret.is_ok());
assert!(s_ret.is_ok()); assert!(s_ret.is_ok());
@@ -547,7 +541,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn peer_conn_pingpong_bothside_timeout() { async fn peer_conn_pingpong_bothside_timeout() {
peer_conn_pingpong_test_common(4, 12, true, true).await; peer_conn_pingpong_test_common(3, 14, true, true).await;
} }
#[tokio::test] #[tokio::test]

42
easytier/src/peers/peer_conn_ping.rs
View File

@@ -289,29 +289,29 @@ impl PeerConnPinger {
"pingpong task recv pingpong_once result" "pingpong task recv pingpong_once result"
); );
if (counter > 5 && loss_rate_20 > 0.74) || (counter > 150 && loss_rate_1 > 0.20) { let current_rx_packets = throughput.rx_packets();
let current_rx_packets = throughput.rx_packets(); if last_rx_packets != current_rx_packets {
let need_close = if last_rx_packets != current_rx_packets { // if we receive some packet from peers, reset the counter to avoid conn close.
// if we receive some packet from peers, we should relax the condition // conn will close only if we have 5 continous round pingpong loss after no packet received.
counter > 50 && loss_rate_1 > 0.5 counter = 0;
}
// TODO: wait more time to see if the loss rate is still high after no rx tracing::debug!(
} else { "counter: {}, loss_rate_1: {}, loss_rate_20: {}, cur_rx_packets: {}, last_rx: {}, node_id: {}",
true counter, loss_rate_1, loss_rate_20, current_rx_packets, last_rx_packets, my_node_id
}; );
if need_close { if (counter > 5 && loss_rate_20 > 0.74) || (counter > 100 && loss_rate_1 > 0.35) {
tracing::warn!( tracing::warn!(
?ret, ?ret,
?self, ?self,
?loss_rate_1, ?loss_rate_1,
?loss_rate_20, ?loss_rate_20,
?last_rx_packets, ?last_rx_packets,
?current_rx_packets, ?current_rx_packets,
"pingpong loss rate too high, closing" "pingpong loss rate too high, closing"
); );
break; break;
}
} }
last_rx_packets = throughput.rx_packets(); last_rx_packets = throughput.rx_packets();