https://github.com/solana-labs/solana/pull/17542 excludes caller's crds values from pull responses. Reverting that commit so that when a (staked) node restarts, it can obtain its crds values before restart from other nodes.
This commit is contained in:
parent
f6812523cd
commit
43ed727ba7
|
@ -533,7 +533,6 @@ impl CrdsGossipPull {
|
||||||
dropped_requests.fetch_add(1, Ordering::Relaxed);
|
dropped_requests.fetch_add(1, Ordering::Relaxed);
|
||||||
return Vec::default();
|
return Vec::default();
|
||||||
}
|
}
|
||||||
let caller_pubkey = caller.pubkey();
|
|
||||||
let caller_wallclock = caller_wallclock.checked_add(jitter).unwrap_or(0);
|
let caller_wallclock = caller_wallclock.checked_add(jitter).unwrap_or(0);
|
||||||
let pred = |entry: &&VersionedCrdsValue| {
|
let pred = |entry: &&VersionedCrdsValue| {
|
||||||
debug_assert!(filter.test_mask(&entry.value_hash));
|
debug_assert!(filter.test_mask(&entry.value_hash));
|
||||||
|
@ -543,8 +542,6 @@ impl CrdsGossipPull {
|
||||||
false
|
false
|
||||||
} else {
|
} else {
|
||||||
!filter.filter_contains(&entry.value_hash)
|
!filter.filter_contains(&entry.value_hash)
|
||||||
&& (entry.value.pubkey() != caller_pubkey
|
|
||||||
|| entry.value.should_force_push(&caller_pubkey))
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
let out: Vec<_> = crds
|
let out: Vec<_> = crds
|
||||||
|
|
Loading…
Reference in New Issue