Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Commit 0c915b0

Browse files
committed
Revert "Error logging"
This reverts commit 18953c3.
1 parent f56149f commit 0c915b0

File tree

3 files changed

+6
-15
lines changed

3 files changed

+6
-15
lines changed

core/src/repair/cluster_slot_state_verifier.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@ pub(crate) fn check_slot_agrees_with_cluster(
853853
purge_repair_slot_counter: &mut PurgeRepairSlotCounter,
854854
slot_state_update: SlotStateUpdate,
855855
) {
856-
error!(
856+
info!(
857857
"check_slot_agrees_with_cluster() slot: {}, root: {}, slot_state_update: {:?}",
858858
slot, root, slot_state_update
859859
);
@@ -870,7 +870,7 @@ pub(crate) fn check_slot_agrees_with_cluster(
870870
return;
871871
}
872872

873-
datapoint_error!(
873+
datapoint_info!(
874874
"duplicate_slot",
875875
("slot", slot, i64),
876876
(
@@ -902,7 +902,7 @@ pub(crate) fn check_slot_agrees_with_cluster(
902902
}
903903
}
904904

905-
datapoint_error!(
905+
datapoint_info!(
906906
"duplicate_confirmed_slot",
907907
("slot", slot, i64),
908908
(

core/src/replay_stage.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,6 @@ impl ReplayStage {
613613
let mut ancestors = bank_forks.read().unwrap().ancestors();
614614
let mut descendants = bank_forks.read().unwrap().descendants();
615615
let did_complete_bank = Self::replay_active_banks(
616-
&my_pubkey,
617616
&blockstore,
618617
&bank_forks,
619618
&my_pubkey,
@@ -921,9 +920,8 @@ impl ReplayStage {
921920
// Reset onto a fork
922921
if let Some(reset_bank) = reset_bank {
923922
if last_reset != reset_bank.last_blockhash() {
924-
error!(
925-
"{} vote bank: {:?} reset bank: {:?}",
926-
my_pubkey,
923+
info!(
924+
"vote bank: {:?} reset bank: {:?}",
927925
vote_bank
928926
.as_ref()
929927
.map(|(b, switch_fork_decision)| (b.slot(), switch_fork_decision)),
@@ -2701,7 +2699,6 @@ impl ReplayStage {
27012699

27022700
#[allow(clippy::too_many_arguments)]
27032701
fn process_replay_results(
2704-
id: &Pubkey,
27052702
blockstore: &Blockstore,
27062703
bank_forks: &RwLock<BankForks>,
27072704
progress: &mut ProgressMap,
@@ -2786,7 +2783,6 @@ impl ReplayStage {
27862783
transaction_status_sender.send_transaction_status_freeze_message(bank);
27872784
}
27882785
bank.freeze();
2789-
error!("{} froze bank {} {:?}", id, bank_slot, bank.hash());
27902786
datapoint_info!(
27912787
"bank_frozen",
27922788
("slot", bank_slot, i64),
@@ -2891,7 +2887,6 @@ impl ReplayStage {
28912887

28922888
#[allow(clippy::too_many_arguments)]
28932889
fn replay_active_banks(
2894-
id: &Pubkey,
28952890
blockstore: &Blockstore,
28962891
bank_forks: &RwLock<BankForks>,
28972892
my_pubkey: &Pubkey,
@@ -2970,7 +2965,6 @@ impl ReplayStage {
29702965
};
29712966

29722967
Self::process_replay_results(
2973-
id,
29742968
blockstore,
29752969
bank_forks,
29762970
progress,

local-cluster/tests/local_cluster.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5316,10 +5316,7 @@ fn test_duplicate_shreds_switch_failure() {
53165316
if original_frozen_hash != dup_frozen_hash {
53175317
break;
53185318
} else {
5319-
panic!(
5320-
"Duplicate leader and partition target got same hash: {}",
5321-
original_frozen_hash
5322-
);
5319+
panic!("Duplicate leader and partition target got same hash: {}", original_frozen_hash);
53235320
}
53245321
}
53255322

0 commit comments

Comments
 (0)