liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

resolve work

Browse Source
This commit is contained in:
Christien Rioux
2023-09-16 11:26:07 -04:00
parent 0c5b89a15e
commit 3a4c211e85
3 changed files with 66 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
veilid-core/src/rpc_processor/mod.rs
View File

@@ -453,7 +453,7 @@ impl RPCProcessor {
//////////////////////////////////////////////////////////////////////
/// Search the DHT for a single node closest to a key and add it to the routing table and return the node reference
/// Search the DHT for a single node and add it to the routing table and return the node reference
/// If no node was found in the timeout, this returns None
async fn search_dht_single_key(
&self,
@@ -491,14 +491,20 @@ impl RPCProcessor {
};
// Routine to call to check if we're done at each step
let check_done = |closest_nodes: &[NodeRef]| {
// If the node we want to locate is one of the closest nodes, return it immediately
if let Some(out) = closest_nodes
.iter()
.find(|x| x.node_ids().contains(&node_id))
{
return Some(out.clone());
let check_done = |_:&[NodeRef]| {
let Ok(Some(nr)) = routing_table
.lookup_node_ref(node_id) else {
return None;
};
// ensure we have some dial info for the entry already,
// and that the node is still alive
// if not, we should keep looking for better info
if !matches!(nr.state(get_aligned_timestamp()),BucketEntryState::Dead) &&
nr.has_any_dial_info() {
return Some(nr);
}
None
};
@@ -534,8 +540,10 @@ impl RPCProcessor {
.map_err(RPCError::internal)?
{
// ensure we have some dial info for the entry already,
// and that the node is still alive
// if not, we should do the find_node anyway
if nr.has_any_dial_info() {
if !matches!(nr.state(get_aligned_timestamp()),BucketEntryState::Dead) &&
nr.has_any_dial_info() {
return Ok(Some(nr));
}
}