Adjust solana-core for cleaner scheduler-pr diff (#33881)
This commit is contained in:
parent
510b6b949f
commit
080285cb95
|
@ -2786,7 +2786,6 @@ impl ReplayStage {
|
||||||
match replay_result {
|
match replay_result {
|
||||||
Ok(replay_tx_count) => tx_count += replay_tx_count,
|
Ok(replay_tx_count) => tx_count += replay_tx_count,
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
// Error means the slot needs to be marked as dead
|
|
||||||
Self::mark_dead_slot(
|
Self::mark_dead_slot(
|
||||||
blockstore,
|
blockstore,
|
||||||
bank,
|
bank,
|
||||||
|
@ -2802,8 +2801,7 @@ impl ReplayStage {
|
||||||
ancestor_hashes_replay_update_sender,
|
ancestor_hashes_replay_update_sender,
|
||||||
purge_repair_slot_counter,
|
purge_repair_slot_counter,
|
||||||
);
|
);
|
||||||
// If the bank was corrupted, don't try to run the below logic to check if the
|
// don't try to run the below logic to check if the bank is completed
|
||||||
// bank is completed
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -812,6 +812,12 @@ impl Validator {
|
||||||
config.block_verification_method, config.block_production_method
|
config.block_verification_method, config.block_production_method
|
||||||
);
|
);
|
||||||
|
|
||||||
|
let (replay_vote_sender, replay_vote_receiver) = unbounded();
|
||||||
|
|
||||||
|
// block min prioritization fee cache should be readable by RPC, and writable by validator
|
||||||
|
// (by both replay stage and banking stage)
|
||||||
|
let prioritization_fee_cache = Arc::new(PrioritizationFeeCache::default());
|
||||||
|
|
||||||
let leader_schedule_cache = Arc::new(leader_schedule_cache);
|
let leader_schedule_cache = Arc::new(leader_schedule_cache);
|
||||||
let entry_notification_sender = entry_notifier_service
|
let entry_notification_sender = entry_notifier_service
|
||||||
.as_ref()
|
.as_ref()
|
||||||
|
@ -939,10 +945,6 @@ impl Validator {
|
||||||
)),
|
)),
|
||||||
};
|
};
|
||||||
|
|
||||||
// block min prioritization fee cache should be readable by RPC, and writable by validator
|
|
||||||
// (by both replay stage and banking stage)
|
|
||||||
let prioritization_fee_cache = Arc::new(PrioritizationFeeCache::default());
|
|
||||||
|
|
||||||
let rpc_override_health_check =
|
let rpc_override_health_check =
|
||||||
Arc::new(AtomicBool::new(config.rpc_config.disable_health_check));
|
Arc::new(AtomicBool::new(config.rpc_config.disable_health_check));
|
||||||
let (
|
let (
|
||||||
|
@ -1229,7 +1231,6 @@ impl Validator {
|
||||||
};
|
};
|
||||||
let last_vote = tower.last_vote();
|
let last_vote = tower.last_vote();
|
||||||
|
|
||||||
let (replay_vote_sender, replay_vote_receiver) = unbounded();
|
|
||||||
let tvu = Tvu::new(
|
let tvu = Tvu::new(
|
||||||
vote_account,
|
vote_account,
|
||||||
authorized_voter_keypairs,
|
authorized_voter_keypairs,
|
||||||
|
|
Loading…
Reference in New Issue