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

Revert "Logging (#5017)" (#5096) 

This reverts commit b50a3bae72.
This commit is contained in:
sakridge 2019-07-14 18:48:15 -07:00 committed by GitHub
parent 9b54528c8e
commit 40faaef9da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/consensus.rs
View File

@ -118,10 +118,6 @@ impl Tower {
} }
let vote_state = VoteState::from(&account); let vote_state = VoteState::from(&account);
if vote_state.is_none() { if vote_state.is_none() {
info!(
"vote state for bank: {}, validator: {} is none",
bank_slot, key
);
datapoint_warn!( datapoint_warn!(
"tower_warn", "tower_warn",
( (
@ -133,10 +129,6 @@ impl Tower {
continue; continue;
} }
let mut vote_state = vote_state.unwrap(); let mut vote_state = vote_state.unwrap();
info!(
"Vote states for slot: {}, account: {}, vote_states {:#?}",
bank_slot, key, vote_state.votes
);
if key == self.epoch_stakes.delegate_pubkey if key == self.epoch_stakes.delegate_pubkey
|| vote_state.node_pubkey == self.epoch_stakes.delegate_pubkey || vote_state.node_pubkey == self.epoch_stakes.delegate_pubkey
@ -160,10 +152,6 @@ impl Tower {
let start_root = vote_state.root_slot; let start_root = vote_state.root_slot;
vote_state.process_slot_vote_unchecked(bank_slot); vote_state.process_slot_vote_unchecked(bank_slot);
info!(
"After simultated vote, vote states for slot: {}, account: {}, vote_states {:#?}",
bank_slot, key, vote_state.votes
);
for vote in &vote_state.votes { for vote in &vote_state.votes {
Self::update_ancestor_lockouts(&mut stake_lockouts, &vote, ancestors); Self::update_ancestor_lockouts(&mut stake_lockouts, &vote, ancestors);

10
core/src/replay_stage.rs
View File

@ -340,7 +340,7 @@ impl ReplayStage {
where where
T: 'static + KeypairUtil + Send + Sync, T: 'static + KeypairUtil + Send + Sync,
{ {
info!("voting on bank {}", bank.slot()); trace!("handle votable bank {}", bank.slot());
if let Some(new_root) = tower.record_vote(bank.slot(), bank.hash()) { if let Some(new_root) = tower.record_vote(bank.slot(), bank.hash()) {
// get the root bank before squash // get the root bank before squash
let root_bank = bank_forks let root_bank = bank_forks
@ -361,7 +361,7 @@ impl ReplayStage {
leader_schedule_cache.set_root(rooted_banks.last().unwrap()); leader_schedule_cache.set_root(rooted_banks.last().unwrap());
bank_forks.write().unwrap().set_root(new_root); bank_forks.write().unwrap().set_root(new_root);
Self::handle_new_root(&bank_forks, progress); Self::handle_new_root(&bank_forks, progress);
info!("new root {}", new_root); trace!("new root {}", new_root);
if let Err(e) = root_bank_sender.send(rooted_banks) { if let Err(e) = root_bank_sender.send(rooted_banks) {
trace!("root_bank_sender failed: {:?}", e); trace!("root_bank_sender failed: {:?}", e);
Err(e)?; Err(e)?;
@ -472,9 +472,6 @@ impl ReplayStage {
.filter(|b| { .filter(|b| {
let is_votable = b.is_votable(); let is_votable = b.is_votable();
trace!("bank is votable: {} {}", b.slot(), is_votable); trace!("bank is votable: {} {}", b.slot(), is_votable);
if !is_votable {
info!("bank is not votable: {}", b.slot());
}
is_votable is_votable
}) })
.filter(|b| { .filter(|b| {
@ -506,9 +503,6 @@ impl ReplayStage {
let vote_threshold = tower.check_vote_stake_threshold(b.slot(), &stake_lockouts); let vote_threshold = tower.check_vote_stake_threshold(b.slot(), &stake_lockouts);
Self::confirm_forks(tower, stake_lockouts, progress, bank_forks); Self::confirm_forks(tower, stake_lockouts, progress, bank_forks);
debug!("bank vote_threshold: {} {}", b.slot(), vote_threshold); debug!("bank vote_threshold: {} {}", b.slot(), vote_threshold);
if !vote_threshold {
info!("bank failed threshold check: {}", b.slot());
}
vote_threshold vote_threshold
}) })
.map(|(b, stake_lockouts)| (tower.calculate_weight(&stake_lockouts), b.clone())) .map(|(b, stake_lockouts)| (tower.calculate_weight(&stake_lockouts), b.clone()))