Git-Mirrors/veilid
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilid.git synced 2024-10-01 01:26:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

propagate set logic to watch logic

Browse Source
This commit is contained in:
Christien Rioux 2023-11-23 10:00:19 -05:00
parent 4a76353f33
commit 077a1808a5
1 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
veilid-core/src/rpc_processor/rpc_watch_value.rs
View File

@ -201,9 +201,26 @@ impl RPCProcessor {
log_rpc!(debug "{}", debug_string);
}
// Get the nodes that we know about that are closer to the the key than our own node
let routing_table = self.routing_table();
let closer_to_key_peers = network_result_try!(
routing_table.find_preferred_peers_closer_to_key(key, vec![CAP_DHT])
);
// See if we would have accepted this as a set
let set_value_count = {
let c = self.config.get();
c.network.dht.set_value_count as usize
};
let ret_expiration = if closer_to_key_peers.len() >= set_value_count {
// Not close enough
Timestamp::default()
} else {
// Close enough, lets watch it
// See if we have this record ourselves, if so, accept the watch
let storage_manager = self.storage_manager();
let ret_expiration = network_result_try!(storage_manager
network_result_try!(storage_manager
.inbound_watch_value(
key,
subkeys,
@ -213,14 +230,7 @@ impl RPCProcessor {
opt_watcher
)
.await
.map_err(RPCError::internal)?);
// Get the nodes that we know about that are closer to the the key than our own node
let routing_table = self.routing_table();
let closer_to_key_peers = if ret_expiration.as_u64() == 0 {
network_result_try!(routing_table.find_preferred_peers_closer_to_key(key, vec![CAP_DHT]))
} else {
vec![]
.map_err(RPCError::internal)?)
};
#[cfg(feature = "debug-dht")]
@ -238,8 +248,14 @@ impl RPCProcessor {
}
// Make WatchValue answer
let watch_value_a =
RPCOperationWatchValueA::new(ret_expiration.as_u64(), closer_to_key_peers)?;
let watch_value_a = RPCOperationWatchValueA::new(
ret_expiration.as_u64(),
if ret_expiration.as_u64() == 0 {
closer_to_key_peers
} else {
vec![]
},
)?;
// Send GetValue answer
self.answer(