blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

removes ip_stake_map field from streamer::StakedNodes (#31078)

This commit is contained in:
behzad nouri 2023-04-07 13:27:29 +00:00 committed by GitHub
parent 0cd57addcf
commit 466a9a2449
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/src/staked_nodes_updater_service.rs
View File

@ -35,14 +35,12 @@ impl StakedNodesUpdaterService {
let mut last_stakes = Instant::now(); let mut last_stakes = Instant::now();
while !exit.load(Ordering::Relaxed) { while !exit.load(Ordering::Relaxed) {
let overrides = shared_staked_nodes_overrides.read().unwrap(); let overrides = shared_staked_nodes_overrides.read().unwrap();
let mut new_ip_to_stake = HashMap::new();
let mut new_id_to_stake = HashMap::new(); let mut new_id_to_stake = HashMap::new();
let mut total_stake = 0; let mut total_stake = 0;
let mut max_stake: u64 = 0; let mut max_stake: u64 = 0;
let mut min_stake: u64 = u64::MAX; let mut min_stake: u64 = u64::MAX;
if Self::try_refresh_stake_maps( if Self::try_refresh_stake_maps(
&mut last_stakes, &mut last_stakes,
&mut new_ip_to_stake,
&mut new_id_to_stake, &mut new_id_to_stake,
&mut total_stake, &mut total_stake,
&mut max_stake, &mut max_stake,
@ -53,7 +51,6 @@ impl StakedNodesUpdaterService {
) { ) {
let mut shared = shared_staked_nodes.write().unwrap(); let mut shared = shared_staked_nodes.write().unwrap();
shared.total_stake = total_stake; shared.total_stake = total_stake;
shared.ip_stake_map = new_ip_to_stake;
shared.pubkey_stake_map = new_id_to_stake; shared.pubkey_stake_map = new_id_to_stake;
} }
} }
@ -65,7 +62,6 @@ impl StakedNodesUpdaterService {
fn try_refresh_stake_maps( fn try_refresh_stake_maps(
last_stakes: &mut Instant, last_stakes: &mut Instant,
ip_to_stake: &mut HashMap<IpAddr, u64>,
id_to_stake: &mut HashMap<Pubkey, u64>, id_to_stake: &mut HashMap<Pubkey, u64>,
total_stake: &mut u64, total_stake: &mut u64,
max_stake: &mut u64, max_stake: &mut u64,
@ -92,28 +88,11 @@ impl StakedNodesUpdaterService {
Some((node.id, *stake)) Some((node.id, *stake))
}) })
.collect(); .collect();
*ip_to_stake = cluster_info
.tvu_peers()
.into_iter()
.filter_map(|node| {
let stake = staked_nodes.get(&node.id)?;
Some((node.tvu.ip(), *stake))
})
.collect();
let my_pubkey = *cluster_info.my_contact_info().pubkey(); let my_pubkey = *cluster_info.my_contact_info().pubkey();
if let Some(stake) = staked_nodes.get(&my_pubkey) { if let Some(stake) = staked_nodes.get(&my_pubkey) {
id_to_stake.insert(my_pubkey, *stake); id_to_stake.insert(my_pubkey, *stake);
if let Ok(tvu) = cluster_info.my_contact_info().tvu() {
ip_to_stake.insert(tvu.ip(), *stake);
} }
} Self::override_stake(cluster_info, total_stake, id_to_stake, overrides);
Self::override_stake(
cluster_info,
total_stake,
id_to_stake,
ip_to_stake,
overrides,
);
*last_stakes = Instant::now(); *last_stakes = Instant::now();
true true
@ -127,7 +106,6 @@ impl StakedNodesUpdaterService {
cluster_info: &ClusterInfo, cluster_info: &ClusterInfo,
total_stake: &mut u64, total_stake: &mut u64,
id_to_stake_map: &mut HashMap<Pubkey, u64>, id_to_stake_map: &mut HashMap<Pubkey, u64>,
ip_to_stake_map: &mut HashMap<IpAddr, u64>,
staked_map_overrides: &HashMap<Pubkey, u64>, staked_map_overrides: &HashMap<Pubkey, u64>,
) { ) {
let nodes: HashMap<Pubkey, IpAddr> = cluster_info let nodes: HashMap<Pubkey, IpAddr> = cluster_info
@ -136,13 +114,12 @@ impl StakedNodesUpdaterService {
.map(|(node, _)| (node.id, node.tvu.ip())) .map(|(node, _)| (node.id, node.tvu.ip()))
.collect(); .collect();
for (id_override, stake_override) in staked_map_overrides { for (id_override, stake_override) in staked_map_overrides {
if let Some(&ip_override) = nodes.get(id_override) { if nodes.contains_key(id_override) {
if let Some(previous_stake) = id_to_stake_map.get(id_override) { if let Some(previous_stake) = id_to_stake_map.get(id_override) {
*total_stake -= previous_stake; *total_stake -= previous_stake;
} }
*total_stake += stake_override; *total_stake += stake_override;
id_to_stake_map.insert(*id_override, *stake_override); id_to_stake_map.insert(*id_override, *stake_override);
ip_to_stake_map.insert(ip_override, *stake_override);
} else { } else {
error!( error!(
"staked nodes overrides configuration for id \ "staked nodes overrides configuration for id \

1
streamer/src/streamer.rs
View File

@ -30,7 +30,6 @@ pub struct StakedNodes {
pub total_stake: u64, pub total_stake: u64,
pub max_stake: u64, pub max_stake: u64,
pub min_stake: u64, pub min_stake: u64,
pub ip_stake_map: HashMap<IpAddr, u64>,
pub pubkey_stake_map: HashMap<Pubkey, u64>, pub pubkey_stake_map: HashMap<Pubkey, u64>,
} }