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

solana-validator set-identity now loads the tower file for the new identity

Browse Source
This commit is contained in:
Michael Vines
2021-07-20 20:53:14 -07:00
parent 71bd434297
commit 61865c0ee0
5 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/consensus.rs
View File

@ -119,7 +119,7 @@ pub struct Tower {
last_vote_tx_blockhash: Hash,
last_timestamp: BlockTimestamp,
#[serde(skip)]
ledger_path: PathBuf,
pub(crate) ledger_path: PathBuf,
#[serde(skip)]
path: PathBuf,
#[serde(skip)]
@ -175,7 +175,7 @@ impl Tower {
tower
}
pub(crate) fn set_identity(&mut self, node_pubkey: Pubkey) {
fn set_identity(&mut self, node_pubkey: Pubkey) {
let path = Self::get_filename(&self.ledger_path, &node_pubkey);
let tmp_path = Self::get_tmp_filename(&path);
self.node_pubkey = node_pubkey;

20
core/src/replay_stage.rs
View File

@ -640,7 +640,25 @@ impl ReplayStage {
identity_keypair = cluster_info.keypair().clone();
let my_old_pubkey = my_pubkey;
my_pubkey = identity_keypair.pubkey();
tower.set_identity(my_pubkey);
// Load the new identity's tower
tower = Tower::restore(&tower.ledger_path, &my_pubkey)
.and_then(|restored_tower| {
let root_bank = bank_forks.read().unwrap().root_bank();
let slot_history = root_bank.get_slot_history();
restored_tower.adjust_lockouts_after_replay(root_bank.slot(), &slot_history)
}).
unwrap_or_else(|err| {
// It's a fatal error if the tower is not present. This is
// necessary to prevent the validator from violating
// lockouts for its new identity
error!("Failed to load tower for {}: {}", my_pubkey, err);
std::process::exit(1);
});
// Ensure the validator can land votes with the new identity before
// becoming leader
has_new_vote_been_rooted = !wait_for_vote_to_start_leader;
warn!("Identity changed from {} to {}", my_old_pubkey, my_pubkey);
}