From 64ae83bf824b963397bc5bbf6cdeeaacebb23f3f Mon Sep 17 00:00:00 2001 From: John Smith Date: Mon, 19 Dec 2022 17:22:52 -0500 Subject: [PATCH] route work --- .../routing_table/tasks/private_route_management.rs | 10 +++++----- veilid-core/src/rpc_processor/operation_waiter.rs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/veilid-core/src/routing_table/tasks/private_route_management.rs b/veilid-core/src/routing_table/tasks/private_route_management.rs index 2a1162b5..b54b73ae 100644 --- a/veilid-core/src/routing_table/tasks/private_route_management.rs +++ b/veilid-core/src/routing_table/tasks/private_route_management.rs @@ -42,7 +42,7 @@ impl RoutingTable { let rss = self.route_spec_store(); let mut must_test_routes = Vec::::new(); let mut unpublished_routes = Vec::<(DHTKey, u64)>::new(); - let mut dead_routes = Vec::::new(); + let mut expired_routes = Vec::::new(); rss.list_allocated_routes(|k, v| { let stats = v.get_stats(); // Ignore nodes that don't need testing @@ -60,7 +60,7 @@ impl RoutingTable { } // Else this is a route that hasnt been used recently enough and we can tear it down else { - dead_routes.push(*k); + expired_routes.push(*k); } Option::<()>::None }); @@ -76,13 +76,13 @@ impl RoutingTable { // Kill off all but N unpublished routes rather than testing them if unpublished_routes.len() > BACKGROUND_SAFETY_ROUTE_COUNT { for x in &unpublished_routes[BACKGROUND_SAFETY_ROUTE_COUNT..] { - dead_routes.push(x.0); + expired_routes.push(x.0); } } // Process dead routes - for r in &dead_routes { - log_rtab!(debug "Dead route no test: {}", r); + for r in &expired_routes { + log_rtab!(debug "Expired route: {}", r); rss.release_route(r); } diff --git a/veilid-core/src/rpc_processor/operation_waiter.rs b/veilid-core/src/rpc_processor/operation_waiter.rs index 6ea1e7b3..0dfdd926 100644 --- a/veilid-core/src/rpc_processor/operation_waiter.rs +++ b/veilid-core/src/rpc_processor/operation_waiter.rs @@ -121,7 +121,7 @@ where Ok(res .on_timeout(|| { log_rpc!(debug "op wait timed out: {}", handle.op_id); - debug_print_backtrace(); + // debug_print_backtrace(); self.cancel_op_waiter(handle.op_id); }) .map(|res| {