blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

evicts old gossip entries by origin's wallclock (#30331) 

Local-timestamp used in current gossip eviction code:
https://github.com/solana-labs/solana/blob/a36e1b211/gossip/src/crds.rs#L469-L511
does not indicate how old the entry is but how recently it was received.

The commit instead uses origin's wallclock to identify old values. In
order to avoid cases where the wallclock on the entry is bogus, it is
capped by local-timestamp.
This commit is contained in:
behzad nouri 2023-02-15 20:03:13 +00:00 committed by GitHub
parent 3bea5fc326
commit eb6d6e9bca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gossip/src/crds.rs
View File

@ -485,21 +485,30 @@ impl Crds {
// all associated values.
let origin = CrdsValueLabel::LegacyContactInfo(*pubkey);
if let Some(origin) = self.table.get(&origin) {
if now < origin.local_timestamp.saturating_add(timeout) {
if origin
.value
.wallclock()
.min(origin.local_timestamp)
.saturating_add(timeout)
> now
{
return vec![];
}
}
// Otherwise check each value's timestamp individually.
index
.into_iter()
.filter_map(|ix| {
let (label, value) = self.table.get_index(*ix).unwrap();
if value.local_timestamp.saturating_add(timeout) <= now {
Some(label.clone())
} else {
None
}
.map(|&ix| self.table.get_index(ix).unwrap())
.filter(|(_, entry)| {
entry
.value
.wallclock()
.min(entry.local_timestamp)
.saturating_add(timeout)
<= now
})
.map(|(label, _)| label)
.cloned()
.collect::<Vec<_>>()
};
thread_pool.install(|| {
@ -871,7 +880,10 @@ mod tests {
fn test_find_old_records_default() {
let thread_pool = ThreadPoolBuilder::new().build().unwrap();
let mut crds = Crds::default();
let val = CrdsValue::new_unsigned(CrdsData::LegacyContactInfo(ContactInfo::default()));
let val = {
let node = ContactInfo::new_localhost(&Pubkey::default(), /*now:*/ 1);
CrdsValue::new_unsigned(CrdsData::LegacyContactInfo(node))
};
assert_eq!(
crds.insert(val.clone(), 1, GossipRoute::LocalMessage),
Ok(())
@ -941,7 +953,10 @@ mod tests {
fn test_find_old_records_staked() {
let thread_pool = ThreadPoolBuilder::new().build().unwrap();
let mut crds = Crds::default();
let val = CrdsValue::new_unsigned(CrdsData::LegacyContactInfo(ContactInfo::default()));
let val = {
let node = ContactInfo::new_localhost(&Pubkey::default(), /*now:*/ 1);
CrdsValue::new_unsigned(CrdsData::LegacyContactInfo(node))
};
assert_eq!(
crds.insert(val.clone(), 1, GossipRoute::LocalMessage),
Ok(())