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

Fix filter_crds_values output alignment with the inputs (#11734) (#11781)

Browse Source 
(cherry picked from commit 418b483af6)

Co-authored-by: behzad nouri <behzadnouri@gmail.com>
This commit is contained in:
mergify[bot]
2020-08-21 20:56:26 +00:00
committed by GitHub
parent 6775e01747
commit cdf6ff7907
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/crds_gossip_pull.rs
View File

@ -390,7 +390,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",
@ -402,11 +403,13 @@ impl CrdsGossipPull {
let mut total_skipped = 0; let mut total_skipped = 0;
let mask_ones: Vec<_> = recent let mask_ones: Vec<_> = recent
.iter() .iter()
.map(|(_caller, filter)| (!0u64).checked_shr(filter.mask_bits).unwrap_or(!0u64)) .map(|(_i, (_caller, filter))| (!0u64).checked_shr(filter.mask_bits).unwrap_or(!0u64))
.collect(); .collect();
for (label, mask) in crds.masks.iter() { for (label, mask) in crds.masks.iter() {
recent.iter().zip(mask_ones.iter()).enumerate().for_each( recent
|(i, ((caller, filter), mask_ones))| { .iter()
.zip(mask_ones.iter())
.for_each(|((i, (caller, filter)), mask_ones)| {
if filter.test_mask_u64(*mask, *mask_ones) { if filter.test_mask_u64(*mask, *mask_ones) {
let item = crds.table.get(label).unwrap(); let item = crds.table.get(label).unwrap();
@ -419,11 +422,10 @@ impl CrdsGossipPull {
} }
if !filter.filter_contains(&item.value_hash) { if !filter.filter_contains(&item.value_hash) {
ret[i].push(item.value.clone()); ret[*i].push(item.value.clone());
} }
} }
}, });
);
} }
inc_new_counter_info!("gossip_filter_crds_values-dropped_values", total_skipped); inc_new_counter_info!("gossip_filter_crds_values-dropped_values", total_skipped);
ret ret
@ -727,15 +729,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]