gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

implements copy-on-write for vote-accounts (#19362)

Browse Source 
Bank::vote_accounts redundantly clones vote-accounts HashMap even though
an immutable reference will suffice:
https://github.com/solana-labs/solana/blob/95c998a19/runtime/src/bank.rs#L5174-L5186

This commit implements copy-on-write semantics for vote-accounts by
wrapping the underlying HashMap in Arc<...>.
This commit is contained in:
behzad nouri
2021-08-30 15:54:01 +00:00
committed by GitHub
parent f19ff84593
commit 8ad52fa095
11 changed files with 215 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/cluster_info_vote_listener.rs
View File

@ -29,7 +29,6 @@ use solana_runtime::{
bank_forks::BankForks, bank_forks::BankForks,
commitment::VOTE_THRESHOLD_SIZE, commitment::VOTE_THRESHOLD_SIZE,
epoch_stakes::{EpochAuthorizedVoters, EpochStakes}, epoch_stakes::{EpochAuthorizedVoters, EpochStakes},
stakes::Stakes,
vote_sender_types::{ReplayVoteReceiver, ReplayedVote}, vote_sender_types::{ReplayVoteReceiver, ReplayedVote},
}; };
use solana_sdk::{ use solana_sdk::{
@ -601,7 +600,7 @@ impl ClusterInfoVoteListener {
// The last vote slot, which is the greatest slot in the stack // The last vote slot, which is the greatest slot in the stack
// of votes in a vote transaction, qualifies for optimistic confirmation. // of votes in a vote transaction, qualifies for optimistic confirmation.
if slot == last_vote_slot { if slot == last_vote_slot {
let vote_accounts = Stakes::vote_accounts(epoch_stakes.stakes()); let vote_accounts = epoch_stakes.stakes().vote_accounts();
let stake = vote_accounts let stake = vote_accounts
.get(vote_pubkey) .get(vote_pubkey)
.map(|(stake, _)| *stake) .map(|(stake, _)| *stake)

6
core/src/commitment_service.rs
View File

@ -183,8 +183,8 @@ impl AggregateCommitmentService {
let mut commitment = HashMap::new(); let mut commitment = HashMap::new();
let mut rooted_stake: Vec<(Slot, u64)> = Vec::new(); let mut rooted_stake: Vec<(Slot, u64)> = Vec::new();
for (_, (lamports, account)) in bank.vote_accounts().into_iter() { for (lamports, account) in bank.vote_accounts().values() {
if lamports == 0 { if *lamports == 0 {
continue; continue;
} }
if let Ok(vote_state) = account.vote_state().as_ref() { if let Ok(vote_state) = account.vote_state().as_ref() {
@ -193,7 +193,7 @@ impl AggregateCommitmentService {
&mut rooted_stake, &mut rooted_stake,
vote_state, vote_state,
ancestors, ancestors,
lamports, *lamports,
); );
} }
} }

128
core/src/consensus.rs
View File

@ -198,17 +198,14 @@ impl Tower {
Self::new(node_pubkey, vote_account, root, &heaviest_bank) Self::new(node_pubkey, vote_account, root, &heaviest_bank)
} }
pub(crate) fn collect_vote_lockouts<F>( pub(crate) fn collect_vote_lockouts(
vote_account_pubkey: &Pubkey, vote_account_pubkey: &Pubkey,
bank_slot: Slot, bank_slot: Slot,
vote_accounts: F, vote_accounts: &HashMap<Pubkey, (/*stake:*/ u64, VoteAccount)>,
ancestors: &HashMap<Slot, HashSet<Slot>>, ancestors: &HashMap<Slot, HashSet<Slot>>,
get_frozen_hash: impl Fn(Slot) -> Option<Hash>, get_frozen_hash: impl Fn(Slot) -> Option<Hash>,
latest_validator_votes_for_frozen_banks: &mut LatestValidatorVotesForFrozenBanks, latest_validator_votes_for_frozen_banks: &mut LatestValidatorVotesForFrozenBanks,
) -> ComputedBankState ) -> ComputedBankState {
where
F: IntoIterator<Item = (Pubkey, (u64, VoteAccount))>,
{
let mut vote_slots = HashSet::new(); let mut vote_slots = HashSet::new();
let mut voted_stakes = HashMap::new(); let mut voted_stakes = HashMap::new();
let mut total_stake = 0; let mut total_stake = 0;
@ -217,7 +214,8 @@ impl Tower {
// keyed by end of the range // keyed by end of the range
let mut lockout_intervals = LockoutIntervals::new(); let mut lockout_intervals = LockoutIntervals::new();
let mut my_latest_landed_vote = None; let mut my_latest_landed_vote = None;
for (key, (voted_stake, account)) in vote_accounts { for (&key, (voted_stake, account)) in vote_accounts.iter() {
let voted_stake = *voted_stake;
if voted_stake == 0 { if voted_stake == 0 {
continue; continue;
} }
@ -1270,56 +1268,60 @@ pub fn reconcile_blockstore_roots_with_tower(
#[cfg(test)] #[cfg(test)]
pub mod test { pub mod test {
use super::*; use {
use crate::{ super::*,
fork_choice::ForkChoice, heaviest_subtree_fork_choice::SlotHashKey, crate::{
replay_stage::HeaviestForkFailures, tower_storage::FileTowerStorage, fork_choice::ForkChoice, heaviest_subtree_fork_choice::SlotHashKey,
vote_simulator::VoteSimulator, replay_stage::HeaviestForkFailures, tower_storage::FileTowerStorage,
vote_simulator::VoteSimulator,
},
itertools::Itertools,
solana_ledger::{blockstore::make_slot_entries, get_tmp_ledger_path},
solana_runtime::bank::Bank,
solana_sdk::{
account::{Account, AccountSharedData, ReadableAccount, WritableAccount},
clock::Slot,
hash::Hash,
pubkey::Pubkey,
signature::Signer,
slot_history::SlotHistory,
},
solana_vote_program::vote_state::{Vote, VoteStateVersions, MAX_LOCKOUT_HISTORY},
std::{
collections::HashMap,
fs::{remove_file, OpenOptions},
io::{Read, Seek, SeekFrom, Write},
path::PathBuf,
sync::Arc,
},
tempfile::TempDir,
trees::tr,
}; };
use solana_ledger::{blockstore::make_slot_entries, get_tmp_ledger_path};
use solana_runtime::bank::Bank;
use solana_sdk::{
account::{Account, AccountSharedData, ReadableAccount, WritableAccount},
clock::Slot,
hash::Hash,
pubkey::Pubkey,
signature::Signer,
slot_history::SlotHistory,
};
use solana_vote_program::vote_state::{Vote, VoteStateVersions, MAX_LOCKOUT_HISTORY};
use std::{
collections::HashMap,
fs::{remove_file, OpenOptions},
io::{Read, Seek, SeekFrom, Write},
path::PathBuf,
sync::Arc,
};
use tempfile::TempDir;
use trees::tr;
fn gen_stakes(stake_votes: &[(u64, &[u64])]) -> Vec<(Pubkey, (u64, VoteAccount))> { fn gen_stakes(stake_votes: &[(u64, &[u64])]) -> HashMap<Pubkey, (u64, VoteAccount)> {
let mut stakes = vec![]; stake_votes
for (lamports, votes) in stake_votes { .iter()
let mut account = AccountSharedData::from(Account { .map(|(lamports, votes)| {
data: vec![0; VoteState::size_of()], let mut account = AccountSharedData::from(Account {
lamports: *lamports, data: vec![0; VoteState::size_of()],
..Account::default() lamports: *lamports,
}); ..Account::default()
let mut vote_state = VoteState::default(); });
for slot in *votes { let mut vote_state = VoteState::default();
vote_state.process_slot_vote_unchecked(*slot); for slot in *votes {
} vote_state.process_slot_vote_unchecked(*slot);
VoteState::serialize( }
&VoteStateVersions::new_current(vote_state), VoteState::serialize(
&mut account.data_as_mut_slice(), &VoteStateVersions::new_current(vote_state),
) &mut account.data_as_mut_slice(),
.expect("serialize state"); )
stakes.push(( .expect("serialize state");
solana_sdk::pubkey::new_rand(), (
(*lamports, VoteAccount::from(account)), solana_sdk::pubkey::new_rand(),
)); (*lamports, VoteAccount::from(account)),
} )
stakes })
.collect()
} }
#[test] #[test]
@ -1964,10 +1966,10 @@ pub mod test {
#[test] #[test]
fn test_collect_vote_lockouts_sums() { fn test_collect_vote_lockouts_sums() {
//two accounts voting for slot 0 with 1 token staked //two accounts voting for slot 0 with 1 token staked
let mut accounts = gen_stakes(&[(1, &[0]), (1, &[0])]); let accounts = gen_stakes(&[(1, &[0]), (1, &[0])]);
accounts.sort_by_key(|(pk, _)| *pk);
let account_latest_votes: Vec<(Pubkey, SlotHashKey)> = accounts let account_latest_votes: Vec<(Pubkey, SlotHashKey)> = accounts
.iter() .iter()
.sorted_by_key(|(pk, _)| *pk)
.map(|(pubkey, _)| (*pubkey, (0, Hash::default()))) .map(|(pubkey, _)| (*pubkey, (0, Hash::default())))
.collect(); .collect();
@ -1984,7 +1986,7 @@ pub mod test {
} = Tower::collect_vote_lockouts( } = Tower::collect_vote_lockouts(
&Pubkey::default(), &Pubkey::default(),
1, 1,
accounts.into_iter(), &accounts,
&ancestors, &ancestors,
|_| Some(Hash::default()), |_| Some(Hash::default()),
&mut latest_validator_votes_for_frozen_banks, &mut latest_validator_votes_for_frozen_banks,
@ -2004,10 +2006,10 @@ pub mod test {
fn test_collect_vote_lockouts_root() { fn test_collect_vote_lockouts_root() {
let votes: Vec<u64> = (0..MAX_LOCKOUT_HISTORY as u64).collect(); let votes: Vec<u64> = (0..MAX_LOCKOUT_HISTORY as u64).collect();
//two accounts voting for slots 0..MAX_LOCKOUT_HISTORY with 1 token staked //two accounts voting for slots 0..MAX_LOCKOUT_HISTORY with 1 token staked
let mut accounts = gen_stakes(&[(1, &votes), (1, &votes)]); let accounts = gen_stakes(&[(1, &votes), (1, &votes)]);
accounts.sort_by_key(|(pk, _)| *pk);
let account_latest_votes: Vec<(Pubkey, SlotHashKey)> = accounts let account_latest_votes: Vec<(Pubkey, SlotHashKey)> = accounts
.iter() .iter()
.sorted_by_key(|(pk, _)| *pk)
.map(|(pubkey, _)| { .map(|(pubkey, _)| {
( (
*pubkey, *pubkey,
@ -2044,7 +2046,7 @@ pub mod test {
} = Tower::collect_vote_lockouts( } = Tower::collect_vote_lockouts(
&Pubkey::default(), &Pubkey::default(),
MAX_LOCKOUT_HISTORY as u64, MAX_LOCKOUT_HISTORY as u64,
accounts.into_iter(), &accounts,
&ancestors, &ancestors,
|_| Some(Hash::default()), |_| Some(Hash::default()),
&mut latest_validator_votes_for_frozen_banks, &mut latest_validator_votes_for_frozen_banks,
@ -2340,7 +2342,7 @@ pub mod test {
} = Tower::collect_vote_lockouts( } = Tower::collect_vote_lockouts(
&Pubkey::default(), &Pubkey::default(),
vote_to_evaluate, vote_to_evaluate,
accounts.clone().into_iter(), &accounts,
&ancestors, &ancestors,
|_| None, |_| None,
&mut LatestValidatorVotesForFrozenBanks::default(), &mut LatestValidatorVotesForFrozenBanks::default(),
@ -2358,7 +2360,7 @@ pub mod test {
} = Tower::collect_vote_lockouts( } = Tower::collect_vote_lockouts(
&Pubkey::default(), &Pubkey::default(),
vote_to_evaluate, vote_to_evaluate,
accounts.into_iter(), &accounts,
&ancestors, &ancestors,
|_| None, |_| None,
&mut LatestValidatorVotesForFrozenBanks::default(), &mut LatestValidatorVotesForFrozenBanks::default(),

2
core/src/replay_stage.rs
View File

@ -2169,7 +2169,7 @@ impl ReplayStage {
let computed_bank_state = Tower::collect_vote_lockouts( let computed_bank_state = Tower::collect_vote_lockouts(
my_vote_pubkey, my_vote_pubkey,
bank_slot, bank_slot,
bank.vote_accounts().into_iter(), &bank.vote_accounts(),
ancestors, ancestors,
|slot| progress.get_hash(slot), |slot| progress.get_hash(slot),
latest_validator_votes_for_frozen_banks, latest_validator_votes_for_frozen_banks,

3
core/src/validator.rs
View File

@ -1544,7 +1544,8 @@ fn get_stake_percent_in_gossip(bank: &Bank, cluster_info: &ClusterInfo, log: boo
let my_shred_version = cluster_info.my_shred_version(); let my_shred_version = cluster_info.my_shred_version();
let my_id = cluster_info.id(); let my_id = cluster_info.id();
for (_, (activated_stake, vote_account)) in bank.vote_accounts() { for (activated_stake, vote_account) in bank.vote_accounts().values() {
let activated_stake = *activated_stake;
total_activated_stake += activated_stake; total_activated_stake += activated_stake;
if activated_stake == 0 { if activated_stake == 0 {

8
ledger-tool/src/main.rs
View File

@ -353,18 +353,18 @@ fn graph_forks(bank_forks: &BankForks, include_all_votes: bool) -> String {
.iter() .iter()
.map(|(_, (stake, _))| stake) .map(|(_, (stake, _))| stake)
.sum(); .sum();
for (_, (stake, vote_account)) in bank.vote_accounts() { for (stake, vote_account) in bank.vote_accounts().values() {
let vote_state = vote_account.vote_state(); let vote_state = vote_account.vote_state();
let vote_state = vote_state.as_ref().unwrap_or(&default_vote_state); let vote_state = vote_state.as_ref().unwrap_or(&default_vote_state);
if let Some(last_vote) = vote_state.votes.iter().last() { if let Some(last_vote) = vote_state.votes.iter().last() {
let entry = last_votes.entry(vote_state.node_pubkey).or_insert(( let entry = last_votes.entry(vote_state.node_pubkey).or_insert((
last_vote.slot, last_vote.slot,
vote_state.clone(), vote_state.clone(),
stake, *stake,
total_stake, total_stake,
)); ));
if entry.0 < last_vote.slot { if entry.0 < last_vote.slot {
*entry = (last_vote.slot, vote_state.clone(), stake, total_stake); *entry = (last_vote.slot, vote_state.clone(), *stake, total_stake);
} }
} }
} }
@ -394,7 +394,7 @@ fn graph_forks(bank_forks: &BankForks, include_all_votes: bool) -> String {
let mut first = true; let mut first = true;
loop { loop {
for (_, (_, vote_account)) in bank.vote_accounts() { for (_, vote_account) in bank.vote_accounts().values() {
let vote_state = vote_account.vote_state(); let vote_state = vote_account.vote_state();
let vote_state = vote_state.as_ref().unwrap_or(&default_vote_state); let vote_state = vote_state.as_ref().unwrap_or(&default_vote_state);
if let Some(last_vote) = vote_state.votes.iter().last() { if let Some(last_vote) = vote_state.votes.iter().last() {

32
ledger/src/blockstore_processor.rs
View File

@ -1114,7 +1114,7 @@ fn load_frozen_forks(
supermajority_root_from_vote_accounts( supermajority_root_from_vote_accounts(
bank.slot(), bank.slot(),
bank.total_epoch_stake(), bank.total_epoch_stake(),
bank.vote_accounts(), &bank.vote_accounts(),
).and_then(|supermajority_root| { ).and_then(|supermajority_root| {
if supermajority_root > *root { if supermajority_root > *root {
// If there's a cluster confirmed root greater than our last // If there's a cluster confirmed root greater than our last
@ -1223,18 +1223,15 @@ fn supermajority_root(roots: &[(Slot, u64)], total_epoch_stake: u64) -> Option<S
None None
} }
fn supermajority_root_from_vote_accounts<I>( fn supermajority_root_from_vote_accounts(
bank_slot: Slot, bank_slot: Slot,
total_epoch_stake: u64, total_epoch_stake: u64,
vote_accounts: I, vote_accounts: &HashMap<Pubkey, (/*stake:*/ u64, VoteAccount)>,
) -> Option<Slot> ) -> Option<Slot> {
where
I: IntoIterator<Item = (Pubkey, (u64, VoteAccount))>,
{
let mut roots_stakes: Vec<(Slot, u64)> = vote_accounts let mut roots_stakes: Vec<(Slot, u64)> = vote_accounts
.into_iter() .iter()
.filter_map(|(key, (stake, account))| { .filter_map(|(key, (stake, account))| {
if stake == 0 { if *stake == 0 {
return None; return None;
} }
@ -1246,7 +1243,7 @@ where
); );
None None
} }
Ok(vote_state) => vote_state.root_slot.map(|root_slot| (root_slot, stake)), Ok(vote_state) => Some((vote_state.root_slot?, *stake)),
} }
}) })
.collect(); .collect();
@ -3591,7 +3588,7 @@ pub mod tests {
#[allow(clippy::field_reassign_with_default)] #[allow(clippy::field_reassign_with_default)]
fn test_supermajority_root_from_vote_accounts() { fn test_supermajority_root_from_vote_accounts() {
let convert_to_vote_accounts = let convert_to_vote_accounts =
|roots_stakes: Vec<(Slot, u64)>| -> Vec<(Pubkey, (u64, VoteAccount))> { |roots_stakes: Vec<(Slot, u64)>| -> HashMap<Pubkey, (u64, VoteAccount)> {
roots_stakes roots_stakes
.into_iter() .into_iter()
.map(|(root, stake)| { .map(|(root, stake)| {
@ -3609,7 +3606,7 @@ pub mod tests {
(stake, VoteAccount::from(vote_account)), (stake, VoteAccount::from(vote_account)),
) )
}) })
.collect_vec() .collect()
}; };
let total_stake = 10; let total_stake = 10;
@ -3617,22 +3614,19 @@ pub mod tests {
// Supermajority root should be None // Supermajority root should be None
assert!( assert!(
supermajority_root_from_vote_accounts(slot, total_stake, std::iter::empty()).is_none() supermajority_root_from_vote_accounts(slot, total_stake, &HashMap::default()).is_none()
); );
// Supermajority root should be None // Supermajority root should be None
let roots_stakes = vec![(8, 1), (3, 1), (4, 1), (8, 1)]; let roots_stakes = vec![(8, 1), (3, 1), (4, 1), (8, 1)];
let accounts = convert_to_vote_accounts(roots_stakes); let accounts = convert_to_vote_accounts(roots_stakes);
assert!( assert!(supermajority_root_from_vote_accounts(slot, total_stake, &accounts).is_none());
supermajority_root_from_vote_accounts(slot, total_stake, accounts.into_iter())
.is_none()
);
// Supermajority root should be 4, has 7/10 of the stake // Supermajority root should be 4, has 7/10 of the stake
let roots_stakes = vec![(8, 1), (3, 1), (4, 1), (8, 5)]; let roots_stakes = vec![(8, 1), (3, 1), (4, 1), (8, 5)];
let accounts = convert_to_vote_accounts(roots_stakes); let accounts = convert_to_vote_accounts(roots_stakes);
assert_eq!( assert_eq!(
supermajority_root_from_vote_accounts(slot, total_stake, accounts.into_iter()).unwrap(), supermajority_root_from_vote_accounts(slot, total_stake, &accounts).unwrap(),
4 4
); );
@ -3640,7 +3634,7 @@ pub mod tests {
let roots_stakes = vec![(8, 1), (3, 1), (4, 1), (8, 6)]; let roots_stakes = vec![(8, 1), (3, 1), (4, 1), (8, 6)];
let accounts = convert_to_vote_accounts(roots_stakes); let accounts = convert_to_vote_accounts(roots_stakes);
assert_eq!( assert_eq!(
supermajority_root_from_vote_accounts(slot, total_stake, accounts.into_iter()).unwrap(), supermajority_root_from_vote_accounts(slot, total_stake, &accounts).unwrap(),
8 8
); );
} }

105
runtime/src/bank.rs
View File

@ -2252,25 +2252,21 @@ impl Bank {
) -> Option<UnixTimestamp> { ) -> Option<UnixTimestamp> {
let mut get_timestamp_estimate_time = Measure::start("get_timestamp_estimate"); let mut get_timestamp_estimate_time = Measure::start("get_timestamp_estimate");
let slots_per_epoch = self.epoch_schedule().slots_per_epoch; let slots_per_epoch = self.epoch_schedule().slots_per_epoch;
let recent_timestamps = let vote_accounts = self.vote_accounts();
self.vote_accounts() let recent_timestamps = vote_accounts.iter().filter_map(|(pubkey, (_, account))| {
.into_iter() let vote_state = account.vote_state();
.filter_map(|(pubkey, (_, account))| { let vote_state = vote_state.as_ref().ok()?;
let vote_state = account.vote_state(); let slot_delta = self.slot().checked_sub(vote_state.last_timestamp.slot)?;
let vote_state = vote_state.as_ref().ok()?; (slot_delta <= slots_per_epoch).then(|| {
let slot_delta = self.slot().checked_sub(vote_state.last_timestamp.slot)?; (
if slot_delta <= slots_per_epoch { *pubkey,
Some(( (
pubkey, vote_state.last_timestamp.slot,
( vote_state.last_timestamp.timestamp,
vote_state.last_timestamp.slot, ),
vote_state.last_timestamp.timestamp, )
), })
)) });
} else {
None
}
});
let slot_duration = Duration::from_nanos(self.ns_per_slot as u64); let slot_duration = Duration::from_nanos(self.ns_per_slot as u64);
let epoch = self.epoch_schedule().get_epoch(self.slot()); let epoch = self.epoch_schedule().get_epoch(self.slot());
let stakes = self.epoch_vote_accounts(epoch)?; let stakes = self.epoch_vote_accounts(epoch)?;
@ -3716,24 +3712,25 @@ impl Bank {
// //
// Ref: collect_fees // Ref: collect_fees
#[allow(clippy::needless_collect)] #[allow(clippy::needless_collect)]
fn distribute_rent_to_validators<I>(&self, vote_accounts: I, rent_to_be_distributed: u64) fn distribute_rent_to_validators(
where &self,
I: IntoIterator<Item = (Pubkey, (u64, VoteAccount))>, vote_accounts: &HashMap<Pubkey, (/*stake:*/ u64, VoteAccount)>,
{ rent_to_be_distributed: u64,
) {
let mut total_staked = 0; let mut total_staked = 0;
// Collect the stake associated with each validator. // Collect the stake associated with each validator.
// Note that a validator may be present in this vector multiple times if it happens to have // Note that a validator may be present in this vector multiple times if it happens to have
// more than one staked vote account somehow // more than one staked vote account somehow
let mut validator_stakes = vote_accounts let mut validator_stakes = vote_accounts
.into_iter() .iter()
.filter_map(|(_vote_pubkey, (staked, account))| { .filter_map(|(_vote_pubkey, (staked, account))| {
if staked == 0 { if *staked == 0 {
None None
} else { } else {
total_staked += staked; total_staked += *staked;
let node_pubkey = account.vote_state().as_ref().ok()?.node_pubkey; let node_pubkey = account.vote_state().as_ref().ok()?.node_pubkey;
Some((node_pubkey, staked)) Some((node_pubkey, *staked))
} }
}) })
.collect::<Vec<(Pubkey, u64)>>(); .collect::<Vec<(Pubkey, u64)>>();
@ -3848,7 +3845,7 @@ impl Bank {
return; return;
} }
self.distribute_rent_to_validators(self.vote_accounts(), rent_to_be_distributed); self.distribute_rent_to_validators(&self.vote_accounts(), rent_to_be_distributed);
} }
fn collect_rent( fn collect_rent(
@ -5198,26 +5195,15 @@ impl Bank {
/// current vote accounts for this bank along with the stake /// current vote accounts for this bank along with the stake
/// attributed to each account /// attributed to each account
/// Note: This clones the entire vote-accounts hashmap. For a single pub fn vote_accounts(&self) -> Arc<HashMap<Pubkey, (/*stake:*/ u64, VoteAccount)>> {
/// account lookup use get_vote_account instead. let stakes = self.stakes.read().unwrap();
pub fn vote_accounts(&self) -> Vec<(Pubkey, (/*stake:*/ u64, VoteAccount))> { Arc::from(stakes.vote_accounts())
self.stakes
.read()
.unwrap()
.vote_accounts()
.iter()
.map(|(k, v)| (*k, v.clone()))
.collect()
} }
/// Vote account for the given vote account pubkey along with the stake. /// Vote account for the given vote account pubkey along with the stake.
pub fn get_vote_account(&self, vote_account: &Pubkey) -> Option<(/*stake:*/ u64, VoteAccount)> { pub fn get_vote_account(&self, vote_account: &Pubkey) -> Option<(/*stake:*/ u64, VoteAccount)> {
self.stakes let stakes = self.stakes.read().unwrap();
.read() stakes.vote_accounts().get(vote_account).cloned()
.unwrap()
.vote_accounts()
.get(vote_account)
.cloned()
} }
/// Get the EpochStakes for a given epoch /// Get the EpochStakes for a given epoch
@ -5239,9 +5225,8 @@ impl Bank {
&self, &self,
epoch: Epoch, epoch: Epoch,
) -> Option<&HashMap<Pubkey, (u64, VoteAccount)>> { ) -> Option<&HashMap<Pubkey, (u64, VoteAccount)>> {
self.epoch_stakes let epoch_stakes = self.epoch_stakes.get(&epoch)?.stakes();
.get(&epoch) Some(epoch_stakes.vote_accounts().as_ref())
.map(|epoch_stakes| Stakes::vote_accounts(epoch_stakes.stakes()))
} }
/// Get the fixed authorized voter for the given vote account for the /// Get the fixed authorized voter for the given vote account for the
@ -6679,7 +6664,7 @@ pub(crate) mod tests {
let bank = Bank::new_for_tests(&genesis_config); let bank = Bank::new_for_tests(&genesis_config);
let old_validator_lamports = bank.get_balance(&validator_pubkey); let old_validator_lamports = bank.get_balance(&validator_pubkey);
bank.distribute_rent_to_validators(bank.vote_accounts(), RENT_TO_BE_DISTRIBUTED); bank.distribute_rent_to_validators(&bank.vote_accounts(), RENT_TO_BE_DISTRIBUTED);
let new_validator_lamports = bank.get_balance(&validator_pubkey); let new_validator_lamports = bank.get_balance(&validator_pubkey);
assert_eq!( assert_eq!(
new_validator_lamports, new_validator_lamports,
@ -6693,7 +6678,7 @@ pub(crate) mod tests {
let bank = std::panic::AssertUnwindSafe(Bank::new_for_tests(&genesis_config)); let bank = std::panic::AssertUnwindSafe(Bank::new_for_tests(&genesis_config));
let old_validator_lamports = bank.get_balance(&validator_pubkey); let old_validator_lamports = bank.get_balance(&validator_pubkey);
let new_validator_lamports = std::panic::catch_unwind(|| { let new_validator_lamports = std::panic::catch_unwind(|| {
bank.distribute_rent_to_validators(bank.vote_accounts(), RENT_TO_BE_DISTRIBUTED); bank.distribute_rent_to_validators(&bank.vote_accounts(), RENT_TO_BE_DISTRIBUTED);
bank.get_balance(&validator_pubkey) bank.get_balance(&validator_pubkey)
}); });
@ -9531,7 +9516,7 @@ pub(crate) mod tests {
bank.process_transaction(&transaction).unwrap(); bank.process_transaction(&transaction).unwrap();
let vote_accounts = bank.vote_accounts().into_iter().collect::<HashMap<_, _>>(); let vote_accounts = bank.vote_accounts();
assert_eq!(vote_accounts.len(), 2); assert_eq!(vote_accounts.len(), 2);
@ -9906,7 +9891,10 @@ pub(crate) mod tests {
} }
// Non-native loader accounts can not be used for instruction processing // Non-native loader accounts can not be used for instruction processing
assert!(bank.stakes.read().unwrap().vote_accounts().is_empty()); {
let stakes = bank.stakes.read().unwrap();
assert!(stakes.vote_accounts().as_ref().is_empty());
}
assert!(bank.stakes.read().unwrap().stake_delegations().is_empty()); assert!(bank.stakes.read().unwrap().stake_delegations().is_empty());
assert_eq!(bank.calculate_capitalization(true), bank.capitalization()); assert_eq!(bank.calculate_capitalization(true), bank.capitalization());
@ -9916,13 +9904,19 @@ pub(crate) mod tests {
.fetch_add(vote_account.lamports() + stake_account.lamports(), Relaxed); .fetch_add(vote_account.lamports() + stake_account.lamports(), Relaxed);
bank.store_account(&vote_id, &vote_account); bank.store_account(&vote_id, &vote_account);
bank.store_account(&stake_id, &stake_account); bank.store_account(&stake_id, &stake_account);
assert!(!bank.stakes.read().unwrap().vote_accounts().is_empty()); {
let stakes = bank.stakes.read().unwrap();
assert!(!stakes.vote_accounts().as_ref().is_empty());
}
assert!(!bank.stakes.read().unwrap().stake_delegations().is_empty()); assert!(!bank.stakes.read().unwrap().stake_delegations().is_empty());
assert_eq!(bank.calculate_capitalization(true), bank.capitalization()); assert_eq!(bank.calculate_capitalization(true), bank.capitalization());
bank.add_builtin("mock_program1", vote_id, mock_ix_processor); bank.add_builtin("mock_program1", vote_id, mock_ix_processor);
bank.add_builtin("mock_program2", stake_id, mock_ix_processor); bank.add_builtin("mock_program2", stake_id, mock_ix_processor);
assert!(bank.stakes.read().unwrap().vote_accounts().is_empty()); {
let stakes = bank.stakes.read().unwrap();
assert!(stakes.vote_accounts().as_ref().is_empty());
}
assert!(bank.stakes.read().unwrap().stake_delegations().is_empty()); assert!(bank.stakes.read().unwrap().stake_delegations().is_empty());
assert_eq!(bank.calculate_capitalization(true), bank.capitalization()); assert_eq!(bank.calculate_capitalization(true), bank.capitalization());
assert_eq!( assert_eq!(
@ -9942,7 +9936,10 @@ pub(crate) mod tests {
bank.update_accounts_hash(); bank.update_accounts_hash();
let new_hash = bank.get_accounts_hash(); let new_hash = bank.get_accounts_hash();
assert_eq!(old_hash, new_hash); assert_eq!(old_hash, new_hash);
assert!(bank.stakes.read().unwrap().vote_accounts().is_empty()); {
let stakes = bank.stakes.read().unwrap();
assert!(stakes.vote_accounts().as_ref().is_empty());
}
assert!(bank.stakes.read().unwrap().stake_delegations().is_empty()); assert!(bank.stakes.read().unwrap().stake_delegations().is_empty());
assert_eq!(bank.calculate_capitalization(true), bank.capitalization()); assert_eq!(bank.calculate_capitalization(true), bank.capitalization());
assert_eq!( assert_eq!(

7
runtime/src/epoch_stakes.rs
View File

@ -24,9 +24,9 @@ pub struct EpochStakes {
impl EpochStakes { impl EpochStakes {
pub fn new(stakes: &Stakes, leader_schedule_epoch: Epoch) -> Self { pub fn new(stakes: &Stakes, leader_schedule_epoch: Epoch) -> Self {
let epoch_vote_accounts = Stakes::vote_accounts(stakes); let epoch_vote_accounts = stakes.vote_accounts();
let (total_stake, node_id_to_vote_accounts, epoch_authorized_voters) = let (total_stake, node_id_to_vote_accounts, epoch_authorized_voters) =
Self::parse_epoch_vote_accounts(epoch_vote_accounts, leader_schedule_epoch); Self::parse_epoch_vote_accounts(epoch_vote_accounts.as_ref(), leader_schedule_epoch);
Self { Self {
stakes: Arc::new(stakes.clone()), stakes: Arc::new(stakes.clone()),
total_stake, total_stake,
@ -52,7 +52,8 @@ impl EpochStakes {
} }
pub fn vote_account_stake(&self, vote_account: &Pubkey) -> u64 { pub fn vote_account_stake(&self, vote_account: &Pubkey) -> u64 {
Stakes::vote_accounts(&self.stakes) self.stakes
.vote_accounts()
.get(vote_account) .get(vote_account)
.map(|(stake, _)| *stake) .map(|(stake, _)| *stake)
.unwrap_or(0) .unwrap_or(0)

4
runtime/src/stakes.rs
View File

@ -196,8 +196,8 @@ impl Stakes {
} }
} }
pub fn vote_accounts(&self) -> &HashMap<Pubkey, (u64, VoteAccount)> { pub fn vote_accounts(&self) -> &VoteAccounts {
self.vote_accounts.as_ref() &self.vote_accounts
} }
pub fn stake_delegations(&self) -> &HashMap<Pubkey, Delegation> { pub fn stake_delegations(&self) -> &HashMap<Pubkey, Delegation> {

92
runtime/src/vote_account.rs
View File

@ -31,7 +31,7 @@ struct VoteAccountInner {
#[derive(Debug, AbiExample)] #[derive(Debug, AbiExample)]
pub struct VoteAccounts { pub struct VoteAccounts {
vote_accounts: HashMap<Pubkey, (/*stake:*/ u64, VoteAccount)>, vote_accounts: Arc<HashMap<Pubkey, (/*stake:*/ u64, VoteAccount)>>,
// Inner Arc is meant to implement copy-on-write semantics as opposed to // Inner Arc is meant to implement copy-on-write semantics as opposed to
// sharing mutations (hence RwLock<Arc<...>> instead of Arc<RwLock<...>>). // sharing mutations (hence RwLock<Arc<...>> instead of Arc<RwLock<...>>).
staked_nodes: RwLock< staked_nodes: RwLock<
@ -46,7 +46,7 @@ pub struct VoteAccounts {
} }
impl VoteAccount { impl VoteAccount {
pub fn lamports(&self) -> u64 { pub(crate) fn lamports(&self) -> u64 {
self.0.account.lamports self.0.account.lamports
} }
@ -83,37 +83,43 @@ impl VoteAccounts {
self.staked_nodes.read().unwrap().clone() self.staked_nodes.read().unwrap().clone()
} }
pub fn iter(&self) -> impl Iterator<Item = (&Pubkey, &(u64, VoteAccount))> { pub fn get(&self, pubkey: &Pubkey) -> Option<&(/*stake:*/ u64, VoteAccount)> {
self.vote_accounts.get(pubkey)
}
pub(crate) fn iter(&self) -> impl Iterator<Item = (&Pubkey, &(u64, VoteAccount))> {
self.vote_accounts.iter() self.vote_accounts.iter()
} }
pub fn insert(&mut self, pubkey: Pubkey, (stake, vote_account): (u64, VoteAccount)) { pub(crate) fn insert(&mut self, pubkey: Pubkey, (stake, vote_account): (u64, VoteAccount)) {
self.add_node_stake(stake, &vote_account); self.add_node_stake(stake, &vote_account);
if let Some((stake, vote_account)) = let vote_accounts = Arc::make_mut(&mut self.vote_accounts);
self.vote_accounts.insert(pubkey, (stake, vote_account)) if let Some((stake, vote_account)) = vote_accounts.insert(pubkey, (stake, vote_account)) {
{
self.sub_node_stake(stake, &vote_account); self.sub_node_stake(stake, &vote_account);
} }
} }
pub fn remove(&mut self, pubkey: &Pubkey) -> Option<(u64, VoteAccount)> { pub(crate) fn remove(&mut self, pubkey: &Pubkey) -> Option<(u64, VoteAccount)> {
let value = self.vote_accounts.remove(pubkey); let vote_accounts = Arc::make_mut(&mut self.vote_accounts);
if let Some((stake, ref vote_account)) = value { let entry = vote_accounts.remove(pubkey);
if let Some((stake, ref vote_account)) = entry {
self.sub_node_stake(stake, vote_account); self.sub_node_stake(stake, vote_account);
} }
value entry
} }
pub fn add_stake(&mut self, pubkey: &Pubkey, delta: u64) { pub(crate) fn add_stake(&mut self, pubkey: &Pubkey, delta: u64) {
if let Some((stake, vote_account)) = self.vote_accounts.get_mut(pubkey) { let vote_accounts = Arc::make_mut(&mut self.vote_accounts);
if let Some((stake, vote_account)) = vote_accounts.get_mut(pubkey) {
*stake += delta; *stake += delta;
let vote_account = vote_account.clone(); let vote_account = vote_account.clone();
self.add_node_stake(delta, &vote_account); self.add_node_stake(delta, &vote_account);
} }
} }
pub fn sub_stake(&mut self, pubkey: &Pubkey, delta: u64) { pub(crate) fn sub_stake(&mut self, pubkey: &Pubkey, delta: u64) {
if let Some((stake, vote_account)) = self.vote_accounts.get_mut(pubkey) { let vote_accounts = Arc::make_mut(&mut self.vote_accounts);
if let Some((stake, vote_account)) = vote_accounts.get_mut(pubkey) {
*stake = stake *stake = stake
.checked_sub(delta) .checked_sub(delta)
.expect("subtraction value exceeds account's stake"); .expect("subtraction value exceeds account's stake");
@ -221,7 +227,7 @@ impl PartialEq<VoteAccountInner> for VoteAccountInner {
impl Default for VoteAccounts { impl Default for VoteAccounts {
fn default() -> Self { fn default() -> Self {
Self { Self {
vote_accounts: HashMap::default(), vote_accounts: Arc::default(),
staked_nodes: RwLock::default(), staked_nodes: RwLock::default(),
staked_nodes_once: Once::new(), staked_nodes_once: Once::new(),
} }
@ -257,8 +263,8 @@ impl PartialEq<VoteAccounts> for VoteAccounts {
type VoteAccountsHashMap = HashMap<Pubkey, (/*stake:*/ u64, VoteAccount)>; type VoteAccountsHashMap = HashMap<Pubkey, (/*stake:*/ u64, VoteAccount)>;
impl From<VoteAccountsHashMap> for VoteAccounts { impl From<Arc<VoteAccountsHashMap>> for VoteAccounts {
fn from(vote_accounts: VoteAccountsHashMap) -> Self { fn from(vote_accounts: Arc<VoteAccountsHashMap>) -> Self {
Self { Self {
vote_accounts, vote_accounts,
staked_nodes: RwLock::default(), staked_nodes: RwLock::default(),
@ -273,12 +279,18 @@ impl AsRef<VoteAccountsHashMap> for VoteAccounts {
} }
} }
impl From<&VoteAccounts> for Arc<VoteAccountsHashMap> {
fn from(vote_accounts: &VoteAccounts) -> Self {
Arc::clone(&vote_accounts.vote_accounts)
}
}
impl FromIterator<(Pubkey, (/*stake:*/ u64, VoteAccount))> for VoteAccounts { impl FromIterator<(Pubkey, (/*stake:*/ u64, VoteAccount))> for VoteAccounts {
fn from_iter<I>(iter: I) -> Self fn from_iter<I>(iter: I) -> Self
where where
I: IntoIterator<Item = (Pubkey, (u64, VoteAccount))>, I: IntoIterator<Item = (Pubkey, (u64, VoteAccount))>,
{ {
Self::from(HashMap::from_iter(iter)) Self::from(Arc::new(HashMap::from_iter(iter)))
} }
} }
@ -297,7 +309,7 @@ impl<'de> Deserialize<'de> for VoteAccounts {
D: Deserializer<'de>, D: Deserializer<'de>,
{ {
let vote_accounts = VoteAccountsHashMap::deserialize(deserializer)?; let vote_accounts = VoteAccountsHashMap::deserialize(deserializer)?;
Ok(Self::from(vote_accounts)) Ok(Self::from(Arc::new(vote_accounts)))
} }
} }
@ -430,7 +442,7 @@ mod tests {
let mut rng = rand::thread_rng(); let mut rng = rand::thread_rng();
let vote_accounts_hash_map: HashMap<Pubkey, (u64, VoteAccount)> = let vote_accounts_hash_map: HashMap<Pubkey, (u64, VoteAccount)> =
new_rand_vote_accounts(&mut rng, 64).take(1024).collect(); new_rand_vote_accounts(&mut rng, 64).take(1024).collect();
let vote_accounts = VoteAccounts::from(vote_accounts_hash_map.clone()); let vote_accounts = VoteAccounts::from(Arc::new(vote_accounts_hash_map.clone()));
assert!(vote_accounts.staked_nodes().len() > 32); assert!(vote_accounts.staked_nodes().len() > 32);
assert_eq!( assert_eq!(
bincode::serialize(&vote_accounts).unwrap(), bincode::serialize(&vote_accounts).unwrap(),
@ -452,12 +464,12 @@ mod tests {
let data = bincode::serialize(&vote_accounts_hash_map).unwrap(); let data = bincode::serialize(&vote_accounts_hash_map).unwrap();
let vote_accounts: VoteAccounts = bincode::deserialize(&data).unwrap(); let vote_accounts: VoteAccounts = bincode::deserialize(&data).unwrap();
assert!(vote_accounts.staked_nodes().len() > 32); assert!(vote_accounts.staked_nodes().len() > 32);
assert_eq!(vote_accounts.vote_accounts, vote_accounts_hash_map); assert_eq!(*vote_accounts.vote_accounts, vote_accounts_hash_map);
let data = bincode::options() let data = bincode::options()
.serialize(&vote_accounts_hash_map) .serialize(&vote_accounts_hash_map)
.unwrap(); .unwrap();
let vote_accounts: VoteAccounts = bincode::options().deserialize(&data).unwrap(); let vote_accounts: VoteAccounts = bincode::options().deserialize(&data).unwrap();
assert_eq!(vote_accounts.vote_accounts, vote_accounts_hash_map); assert_eq!(*vote_accounts.vote_accounts, vote_accounts_hash_map);
} }
#[test] #[test]
@ -542,4 +554,38 @@ mod tests {
} }
} }
} }
// Asserts that returned vote-accounts are copy-on-write references.
#[test]
fn test_vote_accounts_cow() {
let mut rng = rand::thread_rng();
let mut accounts = new_rand_vote_accounts(&mut rng, 64);
// Add vote accounts.
let mut vote_accounts = VoteAccounts::default();
for (pubkey, (stake, vote_account)) in (&mut accounts).take(1024) {
vote_accounts.insert(pubkey, (stake, vote_account));
}
let vote_accounts_hashmap = Arc::<VoteAccountsHashMap>::from(&vote_accounts);
assert_eq!(vote_accounts_hashmap, vote_accounts.vote_accounts);
assert!(Arc::ptr_eq(
&vote_accounts_hashmap,
&vote_accounts.vote_accounts
));
let (pubkey, (more_stake, vote_account)) =
accounts.find(|(_, (stake, _))| *stake != 0).unwrap();
vote_accounts.insert(pubkey, (more_stake, vote_account.clone()));
assert!(!Arc::ptr_eq(
&vote_accounts_hashmap,
&vote_accounts.vote_accounts
));
assert_ne!(vote_accounts_hashmap, vote_accounts.vote_accounts);
let other = (more_stake, vote_account);
for (pk, value) in vote_accounts.iter() {
if *pk != pubkey {
assert_eq!(value, &vote_accounts_hashmap[pk]);
} else {
assert_eq!(value, &other);
}
}
}
} }