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

implements copy-on-write for staked-nodes (backport #19090) (#22507)

Browse Source 
* implements copy-on-write for staked-nodes (#19090)

Bank::staked_nodes and Bank::epoch_staked_nodes redundantly clone
staked-nodes HashMap even though an immutable reference will suffice:
https://github.com/solana-labs/solana/blob/a9014cece/runtime/src/vote_account.rs#L77

This commit implements copy-on-write semantics for staked-nodes by
wrapping the underlying HashMap in Arc<...>.

(cherry picked from commit f302774cf7)

# Conflicts:
#	runtime/src/bank.rs
#	runtime/src/stakes.rs
#	runtime/src/vote_account.rs

* removes backport merge conflicts

Co-authored-by: behzad nouri <behzadnouri@gmail.com>
This commit is contained in:
mergify[bot]
2022-01-14 15:26:11 +00:00
committed by GitHub
parent debac00724
commit 40ef11ec86
9 changed files with 51 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/Cargo.toml
View File

@@ -21,7 +21,7 @@ crossbeam-channel = "0.4"
dir-diff = "0.3.2"
flate2 = "1.0.14"
fnv = "1.0.7"
itertools = "0.9.0"
itertools = "0.10.1"
lazy_static = "1.4.0"
libc = "0.2.81"
libloading = "0.6.2"

4
runtime/src/bank.rs
View File

@@ -5282,7 +5282,7 @@ impl Bank {
self.stakes_cache.stakes().stake_delegations().clone()
}
pub fn staked_nodes(&self) -> HashMap<Pubkey, u64> {
pub fn staked_nodes(&self) -> Arc<HashMap<Pubkey, u64>> {
self.stakes_cache.stakes().staked_nodes()
}
@@ -5312,7 +5312,7 @@ impl Bank {
&self.epoch_stakes
}
pub fn epoch_staked_nodes(&self, epoch: Epoch) -> Option<HashMap<Pubkey, u64>> {
pub fn epoch_staked_nodes(&self, epoch: Epoch) -> Option<Arc<HashMap<Pubkey, u64>>> {
Some(self.epoch_stakes.get(&epoch)?.stakes().staked_nodes())
}

2
runtime/src/stakes.rs
View File

@@ -335,7 +335,7 @@ impl Stakes {
&self.stake_delegations
}
pub fn staked_nodes(&self) -> HashMap<Pubkey, u64> {
pub fn staked_nodes(&self) -> Arc<HashMap<Pubkey, u64>> {
self.vote_accounts.staked_nodes()
}

52
runtime/src/vote_account.rs
View File

@@ -1,4 +1,5 @@
use {
itertools::Itertools,
serde::{
de::{Deserialize, Deserializer},
ser::{Serialize, Serializer},
@@ -40,9 +41,11 @@ pub struct VoteAccounts {
// Inner Arc is meant to implement copy-on-write semantics as opposed to
// sharing mutations (hence RwLock<Arc<...>> instead of Arc<RwLock<...>>).
staked_nodes: RwLock<
HashMap<
Pubkey, // VoteAccount.vote_state.node_pubkey.
u64, // Total stake across all vote-accounts.
Arc<
HashMap<
Pubkey, // VoteAccount.vote_state.node_pubkey.
u64, // Total stake across all vote-accounts.
>,
>,
>,
staked_nodes_once: Once,
@@ -69,20 +72,19 @@ impl VoteAccount {
}
impl VoteAccounts {
pub fn staked_nodes(&self) -> HashMap<Pubkey, u64> {
pub fn staked_nodes(&self) -> Arc<HashMap<Pubkey, u64>> {
self.staked_nodes_once.call_once(|| {
let mut staked_nodes = HashMap::new();
for (stake, vote_account) in
self.vote_accounts.values().filter(|(stake, _)| *stake != 0)
{
if let Some(node_pubkey) = vote_account.node_pubkey() {
staked_nodes
.entry(node_pubkey)
.and_modify(|s| *s += *stake)
.or_insert(*stake);
}
}
*self.staked_nodes.write().unwrap() = staked_nodes
let staked_nodes = self
.vote_accounts
.values()
.filter(|(stake, _)| *stake != 0)
.filter_map(|(stake, vote_account)| {
let node_pubkey = vote_account.node_pubkey()?;
Some((node_pubkey, stake))
})
.into_grouping_map()
.aggregate(|acc, _node_pubkey, stake| Some(acc.unwrap_or_default() + stake));
*self.staked_nodes.write().unwrap() = Arc::new(staked_nodes)
});
self.staked_nodes.read().unwrap().clone()
}
@@ -135,9 +137,9 @@ impl VoteAccounts {
fn add_node_stake(&mut self, stake: u64, vote_account: &VoteAccount) {
if stake != 0 && self.staked_nodes_once.is_completed() {
if let Some(node_pubkey) = vote_account.node_pubkey() {
self.staked_nodes
.write()
.unwrap()
let mut staked_nodes = self.staked_nodes.write().unwrap();
let staked_nodes = Arc::make_mut(&mut staked_nodes);
staked_nodes
.entry(node_pubkey)
.and_modify(|s| *s += stake)
.or_insert(stake);
@@ -148,7 +150,9 @@ impl VoteAccounts {
fn sub_node_stake(&mut self, stake: u64, vote_account: &VoteAccount) {
if stake != 0 && self.staked_nodes_once.is_completed() {
if let Some(node_pubkey) = vote_account.node_pubkey() {
match self.staked_nodes.write().unwrap().entry(node_pubkey) {
let mut staked_nodes = self.staked_nodes.write().unwrap();
let staked_nodes = Arc::make_mut(&mut staked_nodes);
match staked_nodes.entry(node_pubkey) {
Entry::Vacant(_) => panic!("this should not happen!"),
Entry::Occupied(mut entry) => match entry.get().cmp(&stake) {
Ordering::Less => panic!("subtraction value exceeds node's stake"),
@@ -485,7 +489,7 @@ mod tests {
if (k + 1) % 128 == 0 {
assert_eq!(
staked_nodes(&accounts[..k + 1]),
vote_accounts.staked_nodes()
*vote_accounts.staked_nodes()
);
}
}
@@ -495,7 +499,7 @@ mod tests {
let (pubkey, (_, _)) = accounts.swap_remove(index);
vote_accounts.remove(&pubkey);
if (k + 1) % 32 == 0 {
assert_eq!(staked_nodes(&accounts), vote_accounts.staked_nodes());
assert_eq!(staked_nodes(&accounts), *vote_accounts.staked_nodes());
}
}
// Modify the stakes for some of the accounts.
@@ -510,7 +514,7 @@ mod tests {
}
*stake = new_stake;
if (k + 1) % 128 == 0 {
assert_eq!(staked_nodes(&accounts), vote_accounts.staked_nodes());
assert_eq!(staked_nodes(&accounts), *vote_accounts.staked_nodes());
}
}
// Remove everything.
@@ -519,7 +523,7 @@ mod tests {
let (pubkey, (_, _)) = accounts.swap_remove(index);
vote_accounts.remove(&pubkey);
if accounts.len() % 32 == 0 {
assert_eq!(staked_nodes(&accounts), vote_accounts.staked_nodes());
assert_eq!(staked_nodes(&accounts), *vote_accounts.staked_nodes());
}
}
assert!(vote_accounts.staked_nodes.read().unwrap().is_empty());