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

set_leader() now remains local and doesn't emit a LeaderId gossip message

This commit is contained in:
Michael Vines 2019-03-08 11:58:47 -08:00
parent 5b386ec30a
commit de4d14ddc0
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/src/cluster_info.rs
View File

@ -18,7 +18,7 @@ use crate::contact_info::ContactInfo;
use crate::crds_gossip::CrdsGossip; use crate::crds_gossip::CrdsGossip;
use crate::crds_gossip_error::CrdsGossipError; use crate::crds_gossip_error::CrdsGossipError;
use crate::crds_gossip_pull::CRDS_GOSSIP_PULL_CRDS_TIMEOUT_MS; use crate::crds_gossip_pull::CRDS_GOSSIP_PULL_CRDS_TIMEOUT_MS;
use crate::crds_value::{CrdsValue, CrdsValueLabel, LeaderId, Vote}; use crate::crds_value::{CrdsValue, CrdsValueLabel, Vote};
use crate::packet::{to_shared_blob, Blob, SharedBlob, BLOB_SIZE}; use crate::packet::{to_shared_blob, Blob, SharedBlob, BLOB_SIZE};
use crate::result::Result; use crate::result::Result;
use crate::rpc_service::RPC_PORT; use crate::rpc_service::RPC_PORT;
@ -74,6 +74,9 @@ pub struct ClusterInfo {
pub gossip: CrdsGossip, pub gossip: CrdsGossip,
/// set the keypair that will be used to sign crds values generated. It is unset only in tests. /// set the keypair that will be used to sign crds values generated. It is unset only in tests.
pub(crate) keypair: Arc<Keypair>, pub(crate) keypair: Arc<Keypair>,
// TODO: remove gossip_leader_id once all usage of `set_leader()` and `leader_data()` is
// purged
gossip_leader_id: Pubkey,
} }
#[derive(Default, Clone)] #[derive(Default, Clone)]
@ -170,6 +173,7 @@ impl ClusterInfo {
let mut me = Self { let mut me = Self {
gossip: CrdsGossip::default(), gossip: CrdsGossip::default(),
keypair, keypair,
gossip_leader_id: Pubkey::default(),
}; };
let id = node_info.id; let id = node_info.id;
me.gossip.set_self(id); me.gossip.set_self(id);
@ -205,14 +209,9 @@ impl ClusterInfo {
self.lookup(self.id()).cloned().unwrap() self.lookup(self.id()).cloned().unwrap()
} }
fn leader_id(&self) -> Pubkey { fn leader_id(&self) -> Pubkey {
let entry = CrdsValueLabel::LeaderId(self.id()); self.gossip_leader_id
self.gossip
.crds
.lookup(&entry)
.and_then(|v| v.leader_id())
.map(|x| x.leader_id)
.unwrap_or_default()
} }
// Deprecated: don't use leader_data().
pub fn leader_data(&self) -> Option<&NodeInfo> { pub fn leader_data(&self) -> Option<&NodeInfo> {
let leader_id = self.leader_id(); let leader_id = self.leader_id();
if leader_id == Pubkey::default() { if leader_id == Pubkey::default() {
@ -254,15 +253,14 @@ impl ClusterInfo {
) )
} }
pub fn set_leader(&mut self, key: Pubkey) { pub fn set_leader(&mut self, leader_id: Pubkey) {
let prev = self.leader_id(); warn!(
let self_id = self.gossip.id; "{}: LEADER_UPDATE TO {} from {}",
let now = timestamp(); self.gossip.id,
let leader = LeaderId::new(self_id, key, now); leader_id,
let mut entry = CrdsValue::LeaderId(leader); self.leader_id()
warn!("{}: LEADER_UPDATE TO {} from {}", self_id, key, prev); );
entry.sign(&self.keypair); self.gossip_leader_id = leader_id;
self.gossip.process_push_message(&[entry], now);
} }
pub fn push_vote(&mut self, vote: Transaction) { pub fn push_vote(&mut self, vote: Transaction) {