diff --git a/metrics/adjust-dashboard-for-channel.py b/metrics/adjust-dashboard-for-channel.py index 81739aded4..25bed29a8b 100755 --- a/metrics/adjust-dashboard-for-channel.py +++ b/metrics/adjust-dashboard-for-channel.py @@ -67,12 +67,12 @@ else: {'allValue': None, 'datasource': 'Solana Metrics (read-only)', 'hide': 0, - 'includeAll': False, + 'includeAll': True, 'label': 'HostID', 'multi': False, 'name': 'hostid', 'options': [], - 'query': 'SELECT DISTINCT(\"host_id\") FROM \"$testnet\".\"autogen\".\"counter-bank-process_transactions-txs\" ', + 'query': 'SELECT DISTINCT(\"host_id\") FROM \"$testnet\".\"autogen\".\"counter-fullnode-new\" ', 'refresh': 2, 'regex': '', 'sort': 1, diff --git a/src/fullnode.rs b/src/fullnode.rs index c52286886d..0eb95161c3 100644 --- a/src/fullnode.rs +++ b/src/fullnode.rs @@ -3,6 +3,7 @@ use crate::bank::Bank; use crate::broadcast_service::BroadcastService; use crate::cluster_info::{ClusterInfo, Node, NodeInfo}; +use crate::counter::Counter; use crate::db_ledger::{write_entries_to_ledger, DbLedger}; use crate::gossip_service::GossipService; use crate::leader_scheduler::LeaderScheduler; @@ -14,12 +15,13 @@ use crate::tpu::{Tpu, TpuReturnType}; use crate::tpu_forwarder::TpuForwarder; use crate::tvu::{Tvu, TvuReturnType}; use crate::window::{new_window, SharedWindow}; +use log::Level; use solana_sdk::hash::Hash; use solana_sdk::signature::{Keypair, KeypairUtil}; use solana_sdk::timing::timestamp; use std::net::UdpSocket; use std::net::{IpAddr, Ipv4Addr, SocketAddr}; -use std::sync::atomic::{AtomicBool, Ordering}; +use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering}; use std::sync::{Arc, RwLock}; use std::thread::Result; use untrusted::Input; @@ -343,6 +345,8 @@ impl Fullnode { Some(NodeRole::Leader(leader_state)) }; + inc_new_counter_info!("fullnode-new", 1); + Fullnode { keypair, vote_account_keypair,