* Remove deprecated slow epoch boundary methods (#21568)
(cherry picked from commit 1430b58a6d
)
# Conflicts:
# core/src/replay_stage.rs
# core/src/tvu.rs
# core/src/validator.rs
# local-cluster/src/validator_configs.rs
# runtime/src/bank.rs
# runtime/src/stakes.rs
* resolve conflicts
Co-authored-by: Justin Starry <justin@solana.com>
This commit is contained in:
@@ -132,7 +132,6 @@ pub struct ReplayStageConfig {
|
||||
pub cache_block_meta_sender: Option<CacheBlockMetaSender>,
|
||||
pub bank_notification_sender: Option<BankNotificationSender>,
|
||||
pub wait_for_vote_to_start_leader: bool,
|
||||
pub disable_epoch_boundary_optimization: bool,
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
@@ -334,7 +333,6 @@ impl ReplayStage {
|
||||
cache_block_meta_sender,
|
||||
bank_notification_sender,
|
||||
wait_for_vote_to_start_leader,
|
||||
disable_epoch_boundary_optimization,
|
||||
} = config;
|
||||
|
||||
trace!("replay stage");
|
||||
@@ -699,7 +697,6 @@ impl ReplayStage {
|
||||
&retransmit_slots_sender,
|
||||
&mut skipped_slots_info,
|
||||
has_new_vote_been_rooted,
|
||||
disable_epoch_boundary_optimization,
|
||||
);
|
||||
|
||||
let poh_bank = poh_recorder.lock().unwrap().bank();
|
||||
@@ -1090,7 +1087,6 @@ impl ReplayStage {
|
||||
retransmit_slots_sender: &RetransmitSlotsSender,
|
||||
skipped_slots_info: &mut SkippedSlotsInfo,
|
||||
has_new_vote_been_rooted: bool,
|
||||
disable_epoch_boundary_optimization: bool,
|
||||
) {
|
||||
// all the individual calls to poh_recorder.lock() are designed to
|
||||
// increase granularity, decrease contention
|
||||
@@ -1208,10 +1204,7 @@ impl ReplayStage {
|
||||
root_slot,
|
||||
my_pubkey,
|
||||
rpc_subscriptions,
|
||||
NewBankOptions {
|
||||
vote_only_bank,
|
||||
disable_epoch_boundary_optimization,
|
||||
},
|
||||
NewBankOptions { vote_only_bank },
|
||||
);
|
||||
|
||||
let tpu_bank = bank_forks.write().unwrap().insert(tpu_bank);
|
||||
|
@@ -98,7 +98,6 @@ pub struct TvuConfig {
|
||||
pub rocksdb_max_compaction_jitter: Option<u64>,
|
||||
pub wait_for_vote_to_start_leader: bool,
|
||||
pub accounts_shrink_ratio: AccountShrinkThreshold,
|
||||
pub disable_epoch_boundary_optimization: bool,
|
||||
}
|
||||
|
||||
impl Tvu {
|
||||
@@ -282,7 +281,6 @@ impl Tvu {
|
||||
cache_block_meta_sender,
|
||||
bank_notification_sender,
|
||||
wait_for_vote_to_start_leader: tvu_config.wait_for_vote_to_start_leader,
|
||||
disable_epoch_boundary_optimization: tvu_config.disable_epoch_boundary_optimization,
|
||||
};
|
||||
|
||||
let (voting_sender, voting_receiver) = channel();
|
||||
|
@@ -154,7 +154,6 @@ pub struct ValidatorConfig {
|
||||
pub validator_exit: Arc<RwLock<Exit>>,
|
||||
pub no_wait_for_vote_to_start_leader: bool,
|
||||
pub accounts_shrink_ratio: AccountShrinkThreshold,
|
||||
pub disable_epoch_boundary_optimization: bool,
|
||||
}
|
||||
|
||||
impl Default for ValidatorConfig {
|
||||
@@ -213,7 +212,6 @@ impl Default for ValidatorConfig {
|
||||
validator_exit: Arc::new(RwLock::new(Exit::default())),
|
||||
no_wait_for_vote_to_start_leader: true,
|
||||
accounts_shrink_ratio: AccountShrinkThreshold::default(),
|
||||
disable_epoch_boundary_optimization: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -810,7 +808,6 @@ impl Validator {
|
||||
rocksdb_max_compaction_jitter: config.rocksdb_compaction_interval,
|
||||
wait_for_vote_to_start_leader,
|
||||
accounts_shrink_ratio: config.accounts_shrink_ratio,
|
||||
disable_epoch_boundary_optimization: config.disable_epoch_boundary_optimization,
|
||||
},
|
||||
&max_slots,
|
||||
&cost_model,
|
||||
|
Reference in New Issue
Block a user