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

Tweak debug to remove unreadable datapoints (#6060)

This commit is contained in:
sakridge 2019-10-04 16:25:22 -07:00 committed by GitHub
parent 9c9754fa0f
commit 5ef012b2c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 31 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bench-tps/src/bench.rs
View File

@ -9,7 +9,7 @@ use solana_drone::drone::request_airdrop_transaction;
#[cfg(feature = "move")]
use solana_librapay_api::{create_genesis, upload_mint_program, upload_payment_program};
use solana_measure::measure::Measure;
use solana_metrics::datapoint_info;
use solana_metrics::datapoint_debug;
use solana_sdk::{
client::Client,
clock::{DEFAULT_TICKS_PER_SECOND, DEFAULT_TICKS_PER_SLOT, MAX_PROCESSING_AGE},
@ -234,7 +234,7 @@ where
fn metrics_submit_lamport_balance(lamport_balance: u64) {
info!("Token balance: {}", lamport_balance);
datapoint_info!(
datapoint_debug!(
"bench-tps-lamport_balance",
("balance", lamport_balance, i64)
);
@ -361,7 +361,7 @@ fn generate_txs(
duration_as_ms(&duration),
blockhash,
);
datapoint_info!(
datapoint_debug!(
"bench-tps-generate_txs",
("duration", duration_as_ms(&duration), i64)
);
@ -426,7 +426,7 @@ fn do_tx_transfers<T: Client>(
duration_as_ms(&transfer_start.elapsed()),
tx_len as f32 / duration_as_s(&transfer_start.elapsed()),
);
datapoint_info!(
datapoint_debug!(
"bench-tps-do_tx_transfers",
("duration", duration_as_ms(&transfer_start.elapsed()), i64),
("count", tx_len, i64)

4
core/src/blocktree.rs
View File

@ -12,7 +12,7 @@ use std::collections::HashMap;
use rocksdb;
use solana_metrics::{datapoint_error, datapoint_info};
use solana_metrics::{datapoint_debug, datapoint_error};
use solana_sdk::genesis_block::GenesisBlock;
use solana_sdk::hash::Hash;
@ -324,7 +324,7 @@ impl Blocktree {
// 3a. Enough number of shreds = (#data + #coding shreds) > erasure.num_data
for (&(slot, set_index), erasure_meta) in erasure_metas.iter() {
let submit_metrics = |attempted: bool, status: String, recovered: usize| {
datapoint_info!(
datapoint_debug!(
"blocktree-erasure",
("slot", slot as i64, i64),
("start_index", set_index as i64, i64),

2
core/src/broadcast_stage.rs
View File

@ -8,7 +8,7 @@ use crate::poh_recorder::WorkingBankEntry;
use crate::result::{Error, Result};
use crate::service::Service;
use crate::staking_utils;
use solana_metrics::{datapoint_info, inc_new_counter_error, inc_new_counter_info};
use solana_metrics::{datapoint_debug, inc_new_counter_error, inc_new_counter_info};
use std::net::UdpSocket;
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::mpsc::{Receiver, RecvTimeoutError};

2
core/src/broadcast_stage/standard_broadcast_run.rs
View File

@ -49,7 +49,7 @@ impl StandardBroadcastRun {
self.stats.run_elapsed.clear();
}
datapoint_info!(
datapoint_debug!(
"broadcast-service",
("num_entries", num_entries as i64, i64),
("num_shreds", num_shreds as i64, i64),

2
core/src/cluster_info.rs
View File

@ -729,7 +729,7 @@ impl ClusterInfo {
});
last_err?;
datapoint_info!("cluster_info-num_nodes", ("count", broadcast_len + 1, i64));
datapoint_debug!("cluster_info-num_nodes", ("count", broadcast_len + 1, i64));
Ok(())
}

6
core/src/consensus.rs
View File

@ -1,5 +1,5 @@
use crate::bank_forks::BankForks;
use solana_metrics::datapoint_info;
use solana_metrics::datapoint_debug;
use solana_runtime::bank::Bank;
use solana_sdk::account::Account;
use solana_sdk::hash::Hash;
@ -99,7 +99,7 @@ impl Tower {
vote_state.nth_recent_vote(0).map(|v| v.slot).unwrap_or(0) as i64
);
debug!("observed root {}", vote_state.root_slot.unwrap_or(0) as i64);
datapoint_info!(
datapoint_debug!(
"tower-observed",
(
"slot",
@ -214,7 +214,7 @@ impl Tower {
self.lockouts.process_vote_unchecked(&vote);
self.last_vote = vote;
datapoint_info!(
datapoint_debug!(
"tower-vote",
("latest", slot, i64),
("root", self.lockouts.root_slot.unwrap_or(0), i64)

4
core/src/repair_service.rs
View File

@ -6,7 +6,7 @@ use crate::cluster_info::ClusterInfo;
use crate::cluster_info_repair_listener::ClusterInfoRepairListener;
use crate::result::Result;
use crate::service::Service;
use solana_metrics::datapoint_info;
use solana_metrics::datapoint_debug;
use solana_runtime::epoch_schedule::EpochSchedule;
use solana_sdk::pubkey::Pubkey;
use std::collections::BTreeSet;
@ -170,7 +170,7 @@ impl RepairService {
for ((to, req), repair_request) in reqs {
if let Ok(local_addr) = repair_socket.local_addr() {
datapoint_info!(
datapoint_debug!(
"repair_service",
("repair_request", format!("{:?}", repair_request), String),
("to", to.to_string(), String),

2
core/src/replay_stage.rs
View File

@ -330,7 +330,7 @@ impl ReplayStage {
return;
}
datapoint_info!(
datapoint_debug!(
"replay_stage-new_leader",
("slot", poh_slot, i64),
("leader", next_leader.to_string(), String),

2
core/src/retransmit_stage.rs
View File

@ -73,7 +73,7 @@ fn retransmit(
ClusterInfo::retransmit_to(&cluster_info, &children, packet, leader, sock, true)?;
}
}
datapoint_info!("cluster_info-num_nodes", ("count", peers_len, i64));
datapoint_debug!("cluster_info-num_nodes", ("count", peers_len, i64));
Ok(())
}

4
core/src/sigverify_stage.rs
View File

@ -16,7 +16,7 @@ use crate::sigverify::TxOffset;
use crate::streamer::{self, PacketReceiver};
use crossbeam_channel::Sender as CrossbeamSender;
use solana_measure::measure::Measure;
use solana_metrics::{datapoint_info, inc_new_counter_info};
use solana_metrics::{datapoint_debug, inc_new_counter_info};
use solana_sdk::timing;
use std::sync::mpsc::{Receiver, RecvTimeoutError};
use std::sync::{Arc, Mutex};
@ -110,7 +110,7 @@ impl SigVerifyStage {
(len as f32 / verify_batch_time.as_s())
);
datapoint_info!(
datapoint_debug!(
"sigverify_stage-total_verify_time",
("batch_len", batch_len, i64),
("len", len, i64),

32
metrics/src/datapoint.rs
View File

@ -91,56 +91,40 @@ macro_rules! datapoint {
#[macro_export]
macro_rules! datapoint_error {
($name:expr) => {
if log::log_enabled!(log::Level::Error) {
$crate::submit($crate::datapoint!(@point $name), log::Level::Error);
}
$crate::submit($crate::datapoint!(@point $name), log::Level::Error);
};
($name:expr, $($fields:tt)+) => {
if log::log_enabled!(log::Level::Error) {
$crate::submit($crate::datapoint!(@point $name, $($fields)+), log::Level::Error);
}
$crate::submit($crate::datapoint!(@point $name, $($fields)+), log::Level::Error);
};
}
#[macro_export]
macro_rules! datapoint_warn {
($name:expr) => {
if log::log_enabled!(log::Level::Warn) {
$crate::submit($crate::datapoint!(@point $name), log::Level::Warn);
}
$crate::submit($crate::datapoint!(@point $name), log::Level::Warn);
};
($name:expr, $($fields:tt)+) => {
if log::log_enabled!(log::Level::Warn) {
$crate::submit($crate::datapoint!(@point $name, $($fields)+), log::Level::Warn);
}
$crate::submit($crate::datapoint!(@point $name, $($fields)+), log::Level::Warn);
};
}
#[macro_export]
macro_rules! datapoint_info {
($name:expr) => {
if log::log_enabled!(log::Level::Info) {
$crate::submit($crate::datapoint!(@point $name), log::Level::Info);
}
$crate::submit($crate::datapoint!(@point $name), log::Level::Info);
};
($name:expr, $($fields:tt)+) => {
if log::log_enabled!(log::Level::Info) {
$crate::submit($crate::datapoint!(@point $name, $($fields)+), log::Level::Info);
}
$crate::submit($crate::datapoint!(@point $name, $($fields)+), log::Level::Info);
};
}
#[macro_export]
macro_rules! datapoint_debug {
($name:expr) => {
if log::log_enabled!(log::Level::Debug) {
$crate::submit($crate::datapoint!(@point $name), log::Level::Debug);
}
$crate::submit($crate::datapoint!(@point $name), log::Level::Debug);
};
($name:expr, $($fields:tt)+) => {
if log::log_enabled!(log::Level::Debug) {
$crate::submit($crate::datapoint!(@point $name, $($fields)+), log::Level::Debug);
}
$crate::submit($crate::datapoint!(@point $name, $($fields)+), log::Level::Debug);
};
}

4
programs/vote_api/src/vote_instruction.rs
View File

@ -9,7 +9,7 @@ use bincode::deserialize;
use log::*;
use num_derive::{FromPrimitive, ToPrimitive};
use serde_derive::{Deserialize, Serialize};
use solana_metrics::datapoint_info;
use solana_metrics::datapoint_debug;
use solana_sdk::{
account::KeyedAccount,
instruction::{AccountMeta, Instruction, InstructionError},
@ -190,7 +190,7 @@ pub fn process_instruction(
vote_state::authorize(me, rest, &voter_pubkey, vote_authorize)
}
VoteInstruction::Vote(vote) => {
datapoint_info!("vote-native", ("count", 1, i64));
datapoint_debug!("vote-native", ("count", 1, i64));
if rest.len() < 2 {
return Err(InstructionError::InvalidInstructionData);
}

6
sealevel/src/bank.rs
View File

@ -27,7 +27,7 @@ use log::*;
use serde::{Deserialize, Serialize};
use solana_measure::measure::Measure;
use solana_metrics::{
datapoint_info, inc_new_counter_debug, inc_new_counter_error, inc_new_counter_info,
datapoint_debug, inc_new_counter_debug, inc_new_counter_error, inc_new_counter_info,
};
use solana_sdk::{
account::Account,
@ -342,7 +342,7 @@ impl Bank {
message_processor: MessageProcessor::default(),
};
datapoint_info!(
datapoint_debug!(
"bank-new_from_parent-heights",
("slot_height", slot, i64),
("block_height", new.block_height, i64)
@ -593,7 +593,7 @@ impl Bank {
.for_each(|slot| self.src.status_cache.write().unwrap().add_root(*slot));
squash_cache_time.stop();
datapoint_info!(
datapoint_debug!(
"tower-observed",
("squash_accounts_ms", squash_accounts_time.as_ms(), i64),
("squash_cache_ms", squash_cache_time.as_ms(), i64)