Revert "reverts solana-labs#17542 (solana-labs#20259)"

This reverts commit 71239fd.
identity-com · Nov 24, 2021 · 7c6c171 · 7c6c171
1 parent f4db1b8
commit 7c6c171
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/gossip/src/crds_gossip_pull.rs b/gossip/src/crds_gossip_pull.rs
@@ -533,6 +533,7 @@ impl CrdsGossipPull {
                 dropped_requests.fetch_add(1, Ordering::Relaxed);
                 return Vec::default();
             }
+            let caller_pubkey = caller.pubkey();
             let caller_wallclock = caller_wallclock.checked_add(jitter).unwrap_or(0);
             let pred = |entry: &&VersionedCrdsValue| {
                 debug_assert!(filter.test_mask(&entry.value_hash));
@@ -542,6 +543,8 @@ impl CrdsGossipPull {
                     false
                 } else {
                     !filter.filter_contains(&entry.value_hash)
+                        && (entry.value.pubkey() != caller_pubkey
+                            || entry.value.should_force_push(&caller_pubkey))
                 }
             };
             let out: Vec<_> = crds