blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adds feature gated code to drop legacy shreds (#34328)

This commit is contained in:
behzad nouri 2023-12-06 22:47:46 +00:00 committed by GitHub
parent d21e7edd2b
commit d5eee01950
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 75 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
core/src/shred_fetch_stage.rs
View File

@ -10,7 +10,9 @@ use {
solana_perf::packet::{PacketBatch, PacketBatchRecycler, PacketFlags, PACKETS_PER_BATCH}, solana_perf::packet::{PacketBatch, PacketBatchRecycler, PacketFlags, PACKETS_PER_BATCH},
solana_runtime::bank_forks::BankForks, solana_runtime::bank_forks::BankForks,
solana_sdk::{ solana_sdk::{
clock::DEFAULT_MS_PER_SLOT, clock::{Slot, DEFAULT_MS_PER_SLOT},
epoch_schedule::EpochSchedule,
feature_set::{self, FeatureSet},
packet::{Meta, PACKET_DATA_SIZE}, packet::{Meta, PACKET_DATA_SIZE},
pubkey::Pubkey, pubkey::Pubkey,
}, },
@ -50,12 +52,20 @@ impl ShredFetchStage {
.as_ref() .as_ref()
.map(|(_, cluster_info)| cluster_info.keypair().clone()); .map(|(_, cluster_info)| cluster_info.keypair().clone());
let (mut last_root, mut slots_per_epoch, mut last_slot) = { let (
mut last_root,
mut slots_per_epoch,
mut feature_set,
mut epoch_schedule,
mut last_slot,
) = {
let bank_forks_r = bank_forks.read().unwrap(); let bank_forks_r = bank_forks.read().unwrap();
let root_bank = bank_forks_r.root_bank(); let root_bank = bank_forks_r.root_bank();
( (
root_bank.slot(), root_bank.slot(),
root_bank.get_slots_in_epoch(root_bank.epoch()), root_bank.get_slots_in_epoch(root_bank.epoch()),
root_bank.feature_set.clone(),
root_bank.epoch_schedule().clone(),
bank_forks_r.highest_slot(), bank_forks_r.highest_slot(),
) )
}; };
@ -69,6 +79,8 @@ impl ShredFetchStage {
last_slot = bank_forks_r.highest_slot(); last_slot = bank_forks_r.highest_slot();
bank_forks_r.root_bank() bank_forks_r.root_bank()
}; };
feature_set = root_bank.feature_set.clone();
epoch_schedule = root_bank.epoch_schedule().clone();
last_root = root_bank.slot(); last_root = root_bank.slot();
slots_per_epoch = root_bank.get_slots_in_epoch(root_bank.epoch()); slots_per_epoch = root_bank.get_slots_in_epoch(root_bank.epoch());
keypair = repair_context keypair = repair_context
@ -92,10 +104,19 @@ impl ShredFetchStage {
// Limit shreds to 2 epochs away. // Limit shreds to 2 epochs away.
let max_slot = last_slot + 2 * slots_per_epoch; let max_slot = last_slot + 2 * slots_per_epoch;
let should_drop_legacy_shreds =
|shred_slot| should_drop_legacy_shreds(shred_slot, &feature_set, &epoch_schedule);
let turbine_disabled = turbine_disabled.load(Ordering::Relaxed); let turbine_disabled = turbine_disabled.load(Ordering::Relaxed);
for packet in packet_batch.iter_mut().filter(|p| !p.meta().discard()) { for packet in packet_batch.iter_mut().filter(|p| !p.meta().discard()) {
if turbine_disabled if turbine_disabled
|| should_discard_shred(packet, last_root, max_slot, shred_version, &mut stats) || should_discard_shred(
packet,
last_root,
max_slot,
shred_version,
should_drop_legacy_shreds,
&mut stats,
)
{ {
packet.meta_mut().set_discard(true); packet.meta_mut().set_discard(true);
} else { } else {
@ -373,6 +394,22 @@ pub(crate) fn receive_repair_quic_packets(
} }
} }
#[must_use]
fn should_drop_legacy_shreds(
shred_slot: Slot,
feature_set: &FeatureSet,
epoch_schedule: &EpochSchedule,
) -> bool {
match feature_set.activated_slot(&feature_set::drop_legacy_shreds::id()) {
None => false,
Some(feature_slot) => {
let feature_epoch = epoch_schedule.get_epoch(feature_slot);
let shred_epoch = epoch_schedule.get_epoch(shred_slot);
feature_epoch < shred_epoch
}
}
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use { use {
@ -413,6 +450,7 @@ mod tests {
last_root, last_root,
max_slot, max_slot,
shred_version, shred_version,
|_| false, // should_drop_legacy_shreds
&mut stats, &mut stats,
)); ));
let coding = solana_ledger::shred::Shredder::generate_coding_shreds( let coding = solana_ledger::shred::Shredder::generate_coding_shreds(
@ -426,6 +464,7 @@ mod tests {
last_root, last_root,
max_slot, max_slot,
shred_version, shred_version,
|_| false, // should_drop_legacy_shreds
&mut stats, &mut stats,
)); ));
} }
@ -447,6 +486,7 @@ mod tests {
last_root, last_root,
max_slot, max_slot,
shred_version, shred_version,
|_| false, // should_drop_legacy_shreds
&mut stats, &mut stats,
)); ));
assert_eq!(stats.index_overrun, 1); assert_eq!(stats.index_overrun, 1);
@ -468,12 +508,18 @@ mod tests {
3, 3,
max_slot, max_slot,
shred_version, shred_version,
|_| false, // should_drop_legacy_shreds
&mut stats, &mut stats,
)); ));
assert_eq!(stats.slot_out_of_range, 1); assert_eq!(stats.slot_out_of_range, 1);
assert!(should_discard_shred( assert!(should_discard_shred(
&packet, last_root, max_slot, /*shred_version:*/ 345, &mut stats, &packet,
last_root,
max_slot,
345, // shred_version
|_| false, // should_drop_legacy_shreds
&mut stats,
)); ));
assert_eq!(stats.shred_version_mismatch, 1); assert_eq!(stats.shred_version_mismatch, 1);
@ -483,6 +529,7 @@ mod tests {
last_root, last_root,
max_slot, max_slot,
shred_version, shred_version,
|_| false, // should_drop_legacy_shreds
&mut stats, &mut stats,
)); ));
@ -504,6 +551,7 @@ mod tests {
last_root, last_root,
max_slot, max_slot,
shred_version, shred_version,
|_| false, // should_drop_legacy_shreds
&mut stats, &mut stats,
)); ));
@ -515,6 +563,7 @@ mod tests {
last_root, last_root,
max_slot, max_slot,
shred_version, shred_version,
|_| false, // should_drop_legacy_shreds
&mut stats, &mut stats,
)); ));
} }

18
ledger/src/shred.rs
View File

@ -895,6 +895,7 @@ pub fn should_discard_shred(
root: Slot, root: Slot,
max_slot: Slot, max_slot: Slot,
shred_version: u16, shred_version: u16,
should_drop_legacy_shreds: impl Fn(Slot) -> bool,
stats: &mut ShredFetchStats, stats: &mut ShredFetchStats,
) -> bool { ) -> bool {
debug_assert!(root < max_slot); debug_assert!(root < max_slot);
@ -969,7 +970,11 @@ pub fn should_discard_shred(
} }
} }
match shred_variant { match shred_variant {
ShredVariant::LegacyCode | ShredVariant::LegacyData => (), ShredVariant::LegacyCode | ShredVariant::LegacyData => {
if should_drop_legacy_shreds(slot) {
return true;
}
}
ShredVariant::MerkleCode(_) => { ShredVariant::MerkleCode(_) => {
stats.num_shreds_merkle_code = stats.num_shreds_merkle_code.saturating_add(1); stats.num_shreds_merkle_code = stats.num_shreds_merkle_code.saturating_add(1);
} }
@ -1173,6 +1178,7 @@ mod tests {
root, root,
max_slot, max_slot,
shred_version, shred_version,
|_| false, // should_drop_legacy_shreds
&mut stats &mut stats
)); ));
assert_eq!(stats, ShredFetchStats::default()); assert_eq!(stats, ShredFetchStats::default());
@ -1183,6 +1189,7 @@ mod tests {
root, root,
max_slot, max_slot,
shred_version, shred_version,
|_| false, // should_drop_legacy_shreds
&mut stats &mut stats
)); ));
assert_eq!(stats.index_overrun, 1); assert_eq!(stats.index_overrun, 1);
@ -1193,6 +1200,7 @@ mod tests {
root, root,
max_slot, max_slot,
shred_version, shred_version,
|_| false, // should_drop_legacy_shreds
&mut stats &mut stats
)); ));
assert_eq!(stats.index_overrun, 2); assert_eq!(stats.index_overrun, 2);
@ -1203,6 +1211,7 @@ mod tests {
root, root,
max_slot, max_slot,
shred_version, shred_version,
|_| false, // should_drop_legacy_shreds
&mut stats &mut stats
)); ));
assert_eq!(stats.index_overrun, 3); assert_eq!(stats.index_overrun, 3);
@ -1213,6 +1222,7 @@ mod tests {
root, root,
max_slot, max_slot,
shred_version, shred_version,
|_| false, // should_drop_legacy_shreds
&mut stats &mut stats
)); ));
assert_eq!(stats.index_overrun, 4); assert_eq!(stats.index_overrun, 4);
@ -1223,6 +1233,7 @@ mod tests {
root, root,
max_slot, max_slot,
shred_version, shred_version,
|_| false, // should_drop_legacy_shreds
&mut stats &mut stats
)); ));
assert_eq!(stats.bad_parent_offset, 1); assert_eq!(stats.bad_parent_offset, 1);
@ -1243,6 +1254,7 @@ mod tests {
root, root,
max_slot, max_slot,
shred_version, shred_version,
|_| false, // should_drop_legacy_shreds
&mut stats &mut stats
)); ));
@ -1262,6 +1274,7 @@ mod tests {
root, root,
max_slot, max_slot,
shred_version, shred_version,
|_| false, // should_drop_legacy_shreds
&mut stats &mut stats
)); ));
assert_eq!(1, stats.index_out_of_bounds); assert_eq!(1, stats.index_out_of_bounds);
@ -1282,6 +1295,7 @@ mod tests {
root, root,
max_slot, max_slot,
shred_version, shred_version,
|_| false, // should_drop_legacy_shreds
&mut stats &mut stats
)); ));
packet.buffer_mut()[OFFSET_OF_SHRED_VARIANT] = u8::MAX; packet.buffer_mut()[OFFSET_OF_SHRED_VARIANT] = u8::MAX;
@ -1291,6 +1305,7 @@ mod tests {
root, root,
max_slot, max_slot,
shred_version, shred_version,
|_| false, // should_drop_legacy_shreds
&mut stats &mut stats
)); ));
assert_eq!(1, stats.bad_shred_type); assert_eq!(1, stats.bad_shred_type);
@ -1302,6 +1317,7 @@ mod tests {
root, root,
max_slot, max_slot,
shred_version, shred_version,
|_| false, // should_drop_legacy_shreds
&mut stats &mut stats
)); ));
assert_eq!(1, stats.bad_shred_type); assert_eq!(1, stats.bad_shred_type);

5
sdk/src/feature_set.rs
View File

@ -732,6 +732,10 @@ pub mod enable_zk_transfer_with_fee {
solana_sdk::declare_id!("zkNLP7EQALfC1TYeB3biDU7akDckj8iPkvh9y2Mt2K3"); solana_sdk::declare_id!("zkNLP7EQALfC1TYeB3biDU7akDckj8iPkvh9y2Mt2K3");
} }
pub mod drop_legacy_shreds {
solana_sdk::declare_id!("GV49KKQdBNaiv2pgqhS2Dy3GWYJGXMTVYbYkdk91orRy");
}
lazy_static! { lazy_static! {
/// Map of feature identifiers to user-visible description /// Map of feature identifiers to user-visible description
pub static ref FEATURE_NAMES: HashMap<Pubkey, &'static str> = [ pub static ref FEATURE_NAMES: HashMap<Pubkey, &'static str> = [
@ -910,6 +914,7 @@ lazy_static! {
(validate_fee_collector_account::id(), "validate fee collector account #33888"), (validate_fee_collector_account::id(), "validate fee collector account #33888"),
(disable_rent_fees_collection::id(), "Disable rent fees collection #33945"), (disable_rent_fees_collection::id(), "Disable rent fees collection #33945"),
(enable_zk_transfer_with_fee::id(), "enable Zk Token proof program transfer with fee"), (enable_zk_transfer_with_fee::id(), "enable Zk Token proof program transfer with fee"),
(drop_legacy_shreds::id(), "drops legacy shreds #34328"),
/*************** ADD NEW FEATURES HERE ***************/ /*************** ADD NEW FEATURES HERE ***************/
] ]
.iter() .iter()