GRIN/nym
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix client drop loop hanging in network monitor

Browse Source 
Replace infinite busy-wait loop with timeout-based client cleanup to prevent potential system hangs during client lifecycle management.
This commit is contained in:
durch
2025-06-06 11:01:36 +02:00
parent c389f43dd0
commit cab072f2d0
1 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nym-network-monitor/src/main.rs
+35 -11
View File
@@ -52,18 +52,42 @@ async fn make_clients(
tokio::time::sleep(tokio::time::Duration::from_secs(lifetime)).await;
info!("Removing oldest client");
if let Some(dropped_client) = clients.write().await.pop_front() {
loop {
if Arc::strong_count(&dropped_client) == 1 {
if let Some(client) = Arc::into_inner(dropped_client) {
let client_handle = client.into_inner();
client_handle.disconnect().await;
} else {
warn!("Failed to drop client, client had more then one strong ref")
}
break;
const CLIENT_DROP_TIMEOUT: Duration = Duration::from_secs(30);
let start = tokio::time::Instant::now();
// Try immediate unwrap first
match Arc::try_unwrap(dropped_client) {
Ok(client) => {
let client_handle = client.into_inner();
client_handle.disconnect().await;
info!("Successfully disconnected client immediately");
}
Err(dropped_client) => {
// Fallback: wait with timeout for references to drop
info!("Client still has references, waiting for cleanup with timeout");
while start.elapsed() < CLIENT_DROP_TIMEOUT {
if Arc::strong_count(&dropped_client) == 1 {
match Arc::try_unwrap(dropped_client) {
Ok(client) => {
let client_handle = client.into_inner();
client_handle.disconnect().await;
info!("Successfully disconnected client after waiting");
break;
}
Err(_) => {
warn!("Failed to unwrap client despite reference count being 1");
break;
}
}
}
tokio::time::sleep(Duration::from_millis(100)).await;
}
if start.elapsed() >= CLIENT_DROP_TIMEOUT {
warn!("Client drop timed out after {:?}, forcing drop", CLIENT_DROP_TIMEOUT);
// Client will be dropped when Arc goes out of scope
}
}
info!("Client still in use, waiting 2 seconds");
tokio::time::sleep(tokio::time::Duration::from_secs(2)).await;
}
}
}