adds feature to (temporarily) drop merkle shreds from testnet (#29711)

(cherry picked from commit 80a39bd)
solana-labs · Jan 15, 2023 · 36499fb · 36499fb
1 parent bcf6bf1
commit 36499fb
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 6 deletions.
diff --git a/core/src/cluster_nodes.rs b/core/src/cluster_nodes.rs
@@ -525,7 +525,12 @@ fn enable_turbine_fanout_experiments(shred_slot: Slot, root_bank: &Bank) -> bool
 }
 
 // Returns true if the feature is effective for the shred slot.
-fn check_feature_activation(feature: &Pubkey, shred_slot: Slot, root_bank: &Bank) -> bool {
+#[must_use]
+pub(crate) fn check_feature_activation(
+    feature: &Pubkey,
+    shred_slot: Slot,
+    root_bank: &Bank,
+) -> bool {
     match root_bank.feature_set.activated_slot(feature) {
         None => false,
         Some(feature_slot) => {

diff --git a/core/src/shred_fetch_stage.rs b/core/src/shred_fetch_stage.rs
@@ -1,14 +1,21 @@
 //! The `shred_fetch_stage` pulls shreds from UDP sockets and sends it to a channel.
 
 use {
-    crate::{packet_hasher::PacketHasher, serve_repair::ServeRepair},
+    crate::{
+        cluster_nodes::check_feature_activation, packet_hasher::PacketHasher,
+        serve_repair::ServeRepair,
+    },
     crossbeam_channel::{unbounded, Sender},
     lru::LruCache,
     solana_gossip::cluster_info::ClusterInfo,
     solana_ledger::shred::{should_discard_shred, ShredFetchStats},
     solana_perf::packet::{Packet, PacketBatch, PacketBatchRecycler, PacketFlags},
-    solana_runtime::bank_forks::BankForks,
-    solana_sdk::clock::{Slot, DEFAULT_MS_PER_SLOT},
+    solana_runtime::{bank::Bank, bank_forks::BankForks},
+    solana_sdk::{
+        clock::{Slot, DEFAULT_MS_PER_SLOT},
+        feature_set,
+        genesis_config::ClusterType,
+    },
     solana_streamer::streamer::{self, PacketBatchReceiver, StreamerReceiveStats},
     std::{
         net::UdpSocket,
@@ -43,6 +50,7 @@ impl ShredFetchStage {
             .map(|(_, cluster_info)| cluster_info.keypair().clone());
 
         // In the case of bank_forks=None, setup to accept any slot range
+        let mut root_bank = bank_forks.read().unwrap().root_bank();
         let mut last_root = 0;
         let mut last_slot = std::u64::MAX;
         let mut slots_per_epoch = 0;
@@ -60,7 +68,7 @@ impl ShredFetchStage {
                     last_root = bank_forks_r.root();
                     let working_bank = bank_forks_r.working_bank();
                     last_slot = working_bank.slot();
-                    let root_bank = bank_forks_r.root_bank();
+                    root_bank = bank_forks_r.root_bank();
                     slots_per_epoch = root_bank.get_slots_in_epoch(root_bank.epoch());
                 }
                 keypair = repair_context
@@ -84,6 +92,8 @@ impl ShredFetchStage {
 
             // Limit shreds to 2 epochs away.
             let max_slot = last_slot + 2 * slots_per_epoch;
+            let should_drop_merkle_shreds =
+                |shred_slot| should_drop_merkle_shreds(shred_slot, &root_bank);
             for packet in packet_batch.iter_mut() {
                 if should_discard_packet(
                     packet,
@@ -92,6 +102,7 @@ impl ShredFetchStage {
                     shred_version,
                     &packet_hasher,
                     &mut shreds_received,
+                    should_drop_merkle_shreds,
                     &mut stats,
                 ) {
                     packet.meta.set_discard(true);
@@ -229,9 +240,17 @@ fn should_discard_packet(
     shred_version: u16,
     packet_hasher: &PacketHasher,
     shreds_received: &mut LruCache<u64, ()>,
+    should_drop_merkle_shreds: impl Fn(Slot) -> bool,
     stats: &mut ShredFetchStats,
 ) -> bool {
-    if should_discard_shred(packet, root, max_slot, shred_version, stats) {
+    if should_discard_shred(
+        packet,
+        root,
+        max_slot,
+        shred_version,
+        should_drop_merkle_shreds,
+        stats,
+    ) {
         return true;
     }
     let hash = packet_hasher.hash_packet(packet);
@@ -244,6 +263,21 @@ fn should_discard_packet(
     }
 }
 
+#[must_use]
+fn should_drop_merkle_shreds(shred_slot: Slot, root_bank: &Bank) -> bool {
+    root_bank.cluster_type() == ClusterType::Testnet
+        && check_feature_activation(
+            &feature_set::drop_merkle_shreds::id(),
+            shred_slot,
+            root_bank,
+        )
+        && !check_feature_activation(
+            &feature_set::keep_merkle_shreds::id(),
+            shred_slot,
+            root_bank,
+        )
+}
+
 #[cfg(test)]
 mod tests {
     use {
@@ -288,6 +322,7 @@ mod tests {
             shred_version,
             &hasher,
             &mut shreds_received,
+            |_| false, // should_drop_merkle_shreds
             &mut stats,
         ));
         let coding = solana_ledger::shred::Shredder::generate_coding_shreds(
@@ -303,6 +338,7 @@ mod tests {
             shred_version,
             &hasher,
             &mut shreds_received,
+            |_| false, // should_drop_merkle_shreds
             &mut stats,
         ));
     }
@@ -329,6 +365,7 @@ mod tests {
             shred_version,
             &hasher,
             &mut shreds_received,
+            |_| false, // should_drop_merkle_shreds
             &mut stats,
         ));
         assert_eq!(stats.index_overrun, 1);
@@ -352,6 +389,7 @@ mod tests {
             shred_version,
             &hasher,
             &mut shreds_received,
+            |_| false, // should_drop_merkle_shreds
             &mut stats,
         ));
         assert_eq!(stats.slot_out_of_range, 1);
@@ -363,6 +401,7 @@ mod tests {
             345, // shred_version
             &hasher,
             &mut shreds_received,
+            |_| false, // should_drop_merkle_shreds
             &mut stats,
         ));
         assert_eq!(stats.shred_version_mismatch, 1);
@@ -375,6 +414,7 @@ mod tests {
             shred_version,
             &hasher,
             &mut shreds_received,
+            |_| false, // should_drop_merkle_shreds
             &mut stats,
         ));
 
@@ -386,6 +426,7 @@ mod tests {
             shred_version,
             &hasher,
             &mut shreds_received,
+            |_| false, // should_drop_merkle_shreds
             &mut stats,
         ));
         assert_eq!(stats.duplicate_shred, 1);
@@ -410,6 +451,7 @@ mod tests {
             shred_version,
             &hasher,
             &mut shreds_received,
+            |_| false, // should_drop_merkle_shreds
             &mut stats,
         ));
 
@@ -423,6 +465,7 @@ mod tests {
             shred_version,
             &hasher,
             &mut shreds_received,
+            |_| false, // should_drop_merkle_shreds
             &mut stats,
         ));
     }

diff --git a/ledger/src/shred.rs b/ledger/src/shred.rs
@@ -786,6 +786,7 @@ pub fn should_discard_shred(
     root: Slot,
     max_slot: Slot,
     shred_version: u16,
+    should_drop_merkle_shreds: impl Fn(Slot) -> bool,
     stats: &mut ShredFetchStats,
 ) -> bool {
     debug_assert!(root < max_slot);
@@ -874,9 +875,15 @@ pub fn should_discard_shred(
     match shred_variant {
         ShredVariant::LegacyCode | ShredVariant::LegacyData => (),
         ShredVariant::MerkleCode(_) => {
+            if should_drop_merkle_shreds(slot) {
+                return true;
+            }
             stats.num_shreds_merkle_code = stats.num_shreds_merkle_code.saturating_add(1);
         }
         ShredVariant::MerkleData(_) => {
+            if should_drop_merkle_shreds(slot) {
+                return true;
+            }
             stats.num_shreds_merkle_data = stats.num_shreds_merkle_data.saturating_add(1);
         }
     }
@@ -1072,6 +1079,7 @@ mod tests {
             root,
             max_slot,
             shred_version,
+            |_| false, // should_drop_merkle_shreds
             &mut stats
         ));
         assert_eq!(stats, ShredFetchStats::default());
@@ -1082,6 +1090,7 @@ mod tests {
             root,
             max_slot,
             shred_version,
+            |_| false, // should_drop_merkle_shreds
             &mut stats
         ));
         assert_eq!(stats.index_overrun, 1);
@@ -1092,6 +1101,7 @@ mod tests {
             root,
             max_slot,
             shred_version,
+            |_| false, // should_drop_merkle_shreds
             &mut stats
         ));
         assert_eq!(stats.index_overrun, 2);
@@ -1102,6 +1112,7 @@ mod tests {
             root,
             max_slot,
             shred_version,
+            |_| false, // should_drop_merkle_shreds
             &mut stats
         ));
         assert_eq!(stats.index_overrun, 3);
@@ -1112,6 +1123,7 @@ mod tests {
             root,
             max_slot,
             shred_version,
+            |_| false, // should_drop_merkle_shreds
             &mut stats
         ));
         assert_eq!(stats.index_overrun, 4);
@@ -1122,6 +1134,7 @@ mod tests {
             root,
             max_slot,
             shred_version,
+            |_| false, // should_drop_merkle_shreds
             &mut stats
         ));
         assert_eq!(stats.bad_parent_offset, 1);
@@ -1142,6 +1155,7 @@ mod tests {
             root,
             max_slot,
             shred_version,
+            |_| false, // should_drop_merkle_shreds
             &mut stats
         ));
 
@@ -1161,6 +1175,7 @@ mod tests {
             root,
             max_slot,
             shred_version,
+            |_| false, // should_drop_merkle_shreds
             &mut stats
         ));
         assert_eq!(1, stats.index_out_of_bounds);
@@ -1181,6 +1196,7 @@ mod tests {
             root,
             max_slot,
             shred_version,
+            |_| false, // should_drop_merkle_shreds
             &mut stats
         ));
         packet.buffer_mut()[OFFSET_OF_SHRED_VARIANT] = u8::MAX;
@@ -1190,6 +1206,7 @@ mod tests {
             root,
             max_slot,
             shred_version,
+            |_| false, // should_drop_merkle_shreds
             &mut stats
         ));
         assert_eq!(1, stats.bad_shred_type);
@@ -1201,6 +1218,7 @@ mod tests {
             root,
             max_slot,
             shred_version,
+            |_| false, // should_drop_merkle_shreds
             &mut stats
         ));
         assert_eq!(1, stats.bad_shred_type);

diff --git a/sdk/src/feature_set.rs b/sdk/src/feature_set.rs
@@ -528,6 +528,14 @@ pub mod disable_turbine_fanout_experiments {
     solana_sdk::declare_id!("Gz1aLrbeQ4Q6PTSafCZcGWZXz91yVRi7ASFzFEr1U4sa");
 }
 
+pub mod drop_merkle_shreds {
+    solana_sdk::declare_id!("84zy5N23Q9vTZuLc9h1HWUtyM9yCFV2SCmyP9W9C3yHZ");
+}
+
+pub mod keep_merkle_shreds {
+    solana_sdk::declare_id!("HyNQzc7TMNmRhpVHXqDGjpsHzeQie82mDQXSF9hj7nAH");
+}
+
 pub mod move_serialized_len_ptr_in_cpi {
     solana_sdk::declare_id!("74CoWuBmt3rUVUrCb2JiSTvh6nXyBWUsK4SaMj3CtE3T");
 }
@@ -658,6 +666,8 @@ lazy_static! {
         (commission_updates_only_allowed_in_first_half_of_epoch::id(), "validator commission updates are only allowed in the first half of an epoch #29362"),
         (enable_turbine_fanout_experiments::id(), "enable turbine fanout experiments #29393"),
         (disable_turbine_fanout_experiments::id(), "disable turbine fanout experiments #29393"),
+        (drop_merkle_shreds::id(), "drop merkle shreds #29711"),
+        (keep_merkle_shreds::id(), "keep merkle shreds #29711"),
         (move_serialized_len_ptr_in_cpi::id(), "cpi ignore serialized_len_ptr #29592"),
         /*************** ADD NEW FEATURES HERE ***************/
     ]