From 43ed727ba795c68f8b70a623cd1a700ac71beaad Mon Sep 17 00:00:00 2001 From: behzad nouri Date: Mon, 27 Sep 2021 22:03:26 +0000 Subject: [PATCH] reverts #17542 (#20259) 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. --- gossip/src/crds_gossip_pull.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/gossip/src/crds_gossip_pull.rs b/gossip/src/crds_gossip_pull.rs index fb8fcbb3a..544259d4d 100644 --- a/gossip/src/crds_gossip_pull.rs +++ b/gossip/src/crds_gossip_pull.rs @@ -533,7 +533,6 @@ 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)); @@ -543,8 +542,6 @@ 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