gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix filter_crds_values output alignment with the inputs (bp #11734) (#11780)

Browse Source 
* Fix filter_crds_values output alignment with the inputs (#11734)

(cherry picked from commit 418b483af6)

# Conflicts:
#	core/src/crds_gossip_pull.rs

* Resolve conflicts

Co-authored-by: behzad nouri <behzadnouri@gmail.com>
Co-authored-by: Carl <carl@solana.com>
This commit is contained in:
mergify[bot]
2020-08-21 22:24:48 +00:00
committed by GitHub
parent 9ee69017dc
commit 4e0dbd6a73
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/crds_gossip_pull.rs
View File

@ -385,7 +385,8 @@ impl CrdsGossipPull {
let past = now.saturating_sub(msg_timeout); let past = now.saturating_sub(msg_timeout);
let recent: Vec<_> = filters let recent: Vec<_> = filters
.iter() .iter()
.filter(|(caller, _)| caller.wallclock() < future && caller.wallclock() >= past) .enumerate()
.filter(|(_, (caller, _))| caller.wallclock() < future && caller.wallclock() >= past)
.collect(); .collect();
inc_new_counter_info!( inc_new_counter_info!(
"gossip_filter_crds_values-dropped_requests", "gossip_filter_crds_values-dropped_requests",
@ -396,7 +397,7 @@ impl CrdsGossipPull {
} }
let mut total_skipped = 0; let mut total_skipped = 0;
for v in crds.table.values() { for v in crds.table.values() {
recent.iter().enumerate().for_each(|(i, (caller, filter))| { recent.iter().for_each(|(i, (caller, filter))| {
//skip values that are too new //skip values that are too new
if v.value.wallclock() > caller.wallclock().checked_add(jitter).unwrap_or_else(|| 0) if v.value.wallclock() > caller.wallclock().checked_add(jitter).unwrap_or_else(|| 0)
{ {
@ -404,7 +405,7 @@ impl CrdsGossipPull {
return; return;
} }
if !filter.contains(&v.value_hash) { if !filter.contains(&v.value_hash) {
ret[i].push(v.value.clone()); ret[*i].push(v.value.clone());
} }
}); });
} }
@ -710,15 +711,19 @@ mod test {
dest.generate_pull_responses(&dest_crds, &filters, CRDS_GOSSIP_PULL_MSG_TIMEOUT_MS); dest.generate_pull_responses(&dest_crds, &filters, CRDS_GOSSIP_PULL_MSG_TIMEOUT_MS);
assert_eq!(rsp[0].len(), 0); assert_eq!(rsp[0].len(), 0);
assert_eq!(filters.len(), 1);
filters.push(filters[0].clone());
//should return new value since caller is new //should return new value since caller is new
filters[0].0 = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost( filters[1].0 = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
&Pubkey::new_rand(), &Pubkey::new_rand(),
CRDS_GOSSIP_PULL_MSG_TIMEOUT_MS + 1, CRDS_GOSSIP_PULL_MSG_TIMEOUT_MS + 1,
))); )));
let rsp = let rsp =
dest.generate_pull_responses(&dest_crds, &filters, CRDS_GOSSIP_PULL_MSG_TIMEOUT_MS); dest.generate_pull_responses(&dest_crds, &filters, CRDS_GOSSIP_PULL_MSG_TIMEOUT_MS);
assert_eq!(rsp[0].len(), 1); assert_eq!(rsp.len(), 2);
assert_eq!(rsp[0].len(), 0);
assert_eq!(rsp[1].len(), 1); // Orders are also preserved.
} }
#[test] #[test]