remove leader confirmaiton
This commit is contained in:
parent
6956bf635e
commit
6bfe497ab5
|
@ -5,7 +5,6 @@
|
|||
use crate::cluster_info::ClusterInfo;
|
||||
use crate::entry;
|
||||
use crate::entry::Entry;
|
||||
use crate::leader_confirmation_service::LeaderConfirmationService;
|
||||
use crate::leader_schedule_utils;
|
||||
use crate::packet;
|
||||
use crate::packet::SharedPackets;
|
||||
|
@ -69,10 +68,8 @@ impl BankingStage {
|
|||
// Once an entry has been recorded, its blockhash is registered with the bank.
|
||||
let exit = Arc::new(AtomicBool::new(false));
|
||||
|
||||
// Single thread to compute confirmation
|
||||
let lcs_handle = LeaderConfirmationService::start(&poh_recorder, exit.clone());
|
||||
// Many banks that process transactions in parallel.
|
||||
let mut bank_thread_hdls: Vec<JoinHandle<()>> = (0..num_threads)
|
||||
let bank_thread_hdls: Vec<JoinHandle<()>> = (0..num_threads)
|
||||
.map(|_| {
|
||||
let verified_receiver = verified_receiver.clone();
|
||||
let poh_recorder = poh_recorder.clone();
|
||||
|
@ -87,7 +84,6 @@ impl BankingStage {
|
|||
.unwrap()
|
||||
})
|
||||
.collect();
|
||||
bank_thread_hdls.push(lcs_handle);
|
||||
Self { bank_thread_hdls }
|
||||
}
|
||||
|
||||
|
|
|
@ -1,189 +0,0 @@
|
|||
//! The `leader_confirmation_service` module implements the tools necessary
|
||||
//! to generate a thread which regularly calculates the last confirmation times
|
||||
//! observed by the leader
|
||||
|
||||
use crate::poh_recorder::PohRecorder;
|
||||
use solana_metrics::{influxdb, submit};
|
||||
use solana_runtime::bank::Bank;
|
||||
use solana_sdk::timing;
|
||||
use solana_vote_api::vote_state::VoteState;
|
||||
use std::result;
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::thread::sleep;
|
||||
use std::thread::{Builder, JoinHandle};
|
||||
use std::time::Duration;
|
||||
|
||||
#[derive(Debug, PartialEq, Eq)]
|
||||
pub enum ConfirmationError {
|
||||
NoValidSupermajority,
|
||||
}
|
||||
|
||||
pub const COMPUTE_CONFIRMATION_MS: u64 = 100;
|
||||
pub struct LeaderConfirmationService {}
|
||||
|
||||
impl LeaderConfirmationService {
|
||||
fn get_last_supermajority_timestamp(
|
||||
bank: &Bank,
|
||||
last_valid_validator_timestamp: u64,
|
||||
) -> result::Result<u64, ConfirmationError> {
|
||||
let mut total_stake = 0;
|
||||
let mut slots_and_stakes: Vec<(u64, u64)> = vec![];
|
||||
// Hold an accounts_db read lock as briefly as possible, just long enough to collect all
|
||||
// the vote states
|
||||
bank.vote_accounts().for_each(|(_, account)| {
|
||||
total_stake += account.lamports;
|
||||
let vote_state = VoteState::deserialize(&account.data).unwrap();
|
||||
if let Some(stake_and_state) = vote_state
|
||||
.votes
|
||||
.back()
|
||||
.map(|vote| (vote.slot, account.lamports))
|
||||
{
|
||||
slots_and_stakes.push(stake_and_state);
|
||||
}
|
||||
});
|
||||
|
||||
let super_majority_stake = (2 * total_stake) / 3;
|
||||
|
||||
if let Some(last_valid_validator_timestamp) =
|
||||
bank.get_confirmation_timestamp(slots_and_stakes, super_majority_stake)
|
||||
{
|
||||
return Ok(last_valid_validator_timestamp);
|
||||
}
|
||||
|
||||
if last_valid_validator_timestamp != 0 {
|
||||
let now = timing::timestamp();
|
||||
submit(
|
||||
influxdb::Point::new(&"leader-confirmation")
|
||||
.add_field(
|
||||
"duration_ms",
|
||||
influxdb::Value::Integer((now - last_valid_validator_timestamp) as i64),
|
||||
)
|
||||
.to_owned(),
|
||||
);
|
||||
}
|
||||
|
||||
Err(ConfirmationError::NoValidSupermajority)
|
||||
}
|
||||
|
||||
pub fn compute_confirmation(bank: &Bank, last_valid_validator_timestamp: &mut u64) {
|
||||
if let Ok(super_majority_timestamp) =
|
||||
Self::get_last_supermajority_timestamp(bank, *last_valid_validator_timestamp)
|
||||
{
|
||||
let now = timing::timestamp();
|
||||
let confirmation_ms = now - super_majority_timestamp;
|
||||
|
||||
*last_valid_validator_timestamp = super_majority_timestamp;
|
||||
|
||||
submit(
|
||||
influxdb::Point::new(&"leader-confirmation")
|
||||
.add_field(
|
||||
"duration_ms",
|
||||
influxdb::Value::Integer(confirmation_ms as i64),
|
||||
)
|
||||
.to_owned(),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Create a new LeaderConfirmationService for computing confirmation.
|
||||
pub fn start(poh_recorder: &Arc<Mutex<PohRecorder>>, exit: Arc<AtomicBool>) -> JoinHandle<()> {
|
||||
let poh_recorder = poh_recorder.clone();
|
||||
Builder::new()
|
||||
.name("solana-leader-confirmation-service".to_string())
|
||||
.spawn(move || {
|
||||
let mut last_valid_validator_timestamp = 0;
|
||||
loop {
|
||||
if exit.load(Ordering::Relaxed) {
|
||||
break;
|
||||
}
|
||||
// dont hold this lock too long
|
||||
let maybe_bank = poh_recorder.lock().unwrap().bank();
|
||||
if let Some(ref bank) = maybe_bank {
|
||||
Self::compute_confirmation(bank, &mut last_valid_validator_timestamp);
|
||||
}
|
||||
sleep(Duration::from_millis(COMPUTE_CONFIRMATION_MS));
|
||||
}
|
||||
})
|
||||
.unwrap()
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::voting_keypair::tests::{new_vote_account, push_vote};
|
||||
use bincode::serialize;
|
||||
use solana_sdk::genesis_block::GenesisBlock;
|
||||
use solana_sdk::hash::hash;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use solana_sdk::signature::{Keypair, KeypairUtil};
|
||||
use solana_sdk::timing::MAX_RECENT_BLOCKHASHES;
|
||||
use solana_sdk::transaction::Transaction;
|
||||
use solana_vote_api::vote_instruction::{Vote, VoteInstruction};
|
||||
use std::sync::Arc;
|
||||
|
||||
#[test]
|
||||
fn test_compute_confirmation() {
|
||||
solana_logger::setup();
|
||||
|
||||
let (genesis_block, mint_keypair) = GenesisBlock::new(1234);
|
||||
let mut tick_hash = genesis_block.hash();
|
||||
|
||||
let mut bank = Arc::new(Bank::new(&genesis_block));
|
||||
|
||||
// Move the bank up MAX_RECENT_BLOCKHASHES slots
|
||||
for slot in 1..=MAX_RECENT_BLOCKHASHES as u64 {
|
||||
let max_tick_height = slot * bank.ticks_per_slot() - 1;
|
||||
|
||||
while bank.tick_height() != max_tick_height {
|
||||
tick_hash = hash(&serialize(&tick_hash).unwrap());
|
||||
bank.register_tick(&tick_hash);
|
||||
}
|
||||
|
||||
bank = Arc::new(Bank::new_from_parent(&bank, &Pubkey::default(), slot));
|
||||
}
|
||||
|
||||
// Create a total of 10 vote accounts, each will have a balance of 1 (after giving 1 to
|
||||
// their vote account), for a total staking pool of 10 lamports.
|
||||
let vote_accounts: Vec<_> = (0..10)
|
||||
.map(|i| {
|
||||
// Create new validator to vote
|
||||
let validator_keypair = Arc::new(Keypair::new());
|
||||
let voting_keypair = Keypair::new();
|
||||
let voting_pubkey = voting_keypair.pubkey();
|
||||
|
||||
// Give the validator some lamports
|
||||
bank.transfer(2, &mint_keypair, &validator_keypair.pubkey())
|
||||
.unwrap();
|
||||
new_vote_account(&validator_keypair, &voting_pubkey, &bank, 1);
|
||||
|
||||
if i < 6 {
|
||||
push_vote(
|
||||
&voting_keypair,
|
||||
&bank,
|
||||
MAX_RECENT_BLOCKHASHES.saturating_sub(i) as u64,
|
||||
);
|
||||
}
|
||||
(voting_keypair, validator_keypair)
|
||||
})
|
||||
.collect();
|
||||
|
||||
// There isn't 2/3 consensus, so the bank's confirmation value should be the default
|
||||
let mut last_confirmation_time = 0;
|
||||
LeaderConfirmationService::compute_confirmation(&bank, &mut last_confirmation_time);
|
||||
assert_eq!(last_confirmation_time, 0);
|
||||
|
||||
// Get another validator to vote, so we now have 2/3 consensus
|
||||
let blockhash = bank.last_blockhash();
|
||||
let voting_keypair = &vote_accounts[7].0;
|
||||
let vote = Vote::new(MAX_RECENT_BLOCKHASHES as u64);
|
||||
let vote_ix = VoteInstruction::new_vote(&voting_keypair.pubkey(), vote);
|
||||
let vote_tx =
|
||||
Transaction::new_signed_instructions(&[voting_keypair], vec![vote_ix], blockhash, 0);
|
||||
bank.process_transaction(&vote_tx).unwrap();
|
||||
|
||||
LeaderConfirmationService::compute_confirmation(&bank, &mut last_confirmation_time);
|
||||
assert!(last_confirmation_time > 0);
|
||||
}
|
||||
}
|
|
@ -38,7 +38,6 @@ pub mod fetch_stage;
|
|||
pub mod fullnode;
|
||||
pub mod gen_keys;
|
||||
pub mod gossip_service;
|
||||
pub mod leader_confirmation_service;
|
||||
pub mod leader_schedule;
|
||||
pub mod leader_schedule_utils;
|
||||
pub mod local_cluster;
|
||||
|
|
Loading…
Reference in New Issue