From ae73cc8d059472976f08a733f88547ae8c1f5938 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Sat, 9 Jan 2021 08:14:14 +0000 Subject: [PATCH] Humanize the 'ledger processed...' time (#14511) (cherry picked from commit 86c81a0ba269bdc5ab0a7d5f6c9bd913930a880a) Co-authored-by: Michael Vines --- Cargo.lock | 1 + ledger/Cargo.toml | 1 + ledger/src/blockstore_processor.rs | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 428f57b407..0303311d5a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4328,6 +4328,7 @@ dependencies = [ "bincode", "byteorder", "chrono", + "chrono-humanize", "crossbeam-channel", "dlopen", "dlopen_derive", diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml index 49f0b2f0e0..967beacc8c 100644 --- a/ledger/Cargo.toml +++ b/ledger/Cargo.toml @@ -12,6 +12,7 @@ edition = "2018" bincode = "1.3.1" byteorder = "1.3.4" chrono = { version = "0.4.11", features = ["serde"] } +chrono-humanize = "0.1.1" crossbeam-channel = "0.4" dlopen_derive = "0.1.4" dlopen = "0.1.8" diff --git a/ledger/src/blockstore_processor.rs b/ledger/src/blockstore_processor.rs index 5a34024337..557bf1c139 100644 --- a/ledger/src/blockstore_processor.rs +++ b/ledger/src/blockstore_processor.rs @@ -6,6 +6,7 @@ use crate::{ entry::{create_ticks, Entry, EntrySlice, EntryVerificationStatus, VerifyRecyclers}, leader_schedule_cache::LeaderScheduleCache, }; +use chrono_humanize::{Accuracy, HumanTime, Tense}; use crossbeam_channel::Sender; use itertools::Itertools; use log::*; @@ -34,7 +35,6 @@ use solana_sdk::{ hash::Hash, pubkey::Pubkey, signature::{Keypair, Signature}, - timing::duration_as_ms, transaction::{Result, Transaction, TransactionError}, }; use solana_transaction_status::token_balances::{ @@ -479,8 +479,8 @@ fn do_process_blockstore_from_root( let bank_forks = BankForks::new_from_banks(&initial_forks, root); info!( - "ledger processed in {}ms. {} MB allocated. root={}, {} fork{} at {}, with {} frozen bank{}", - duration_as_ms(&now.elapsed()), + "ledger processed in {}. {} MB allocated. root slot is {}, {} fork{} at {}, with {} frozen bank{}", + HumanTime::from(chrono::Duration::from_std(now.elapsed()).unwrap()).to_text_en(Accuracy::Precise, Tense::Present), allocated.since(initial_allocation) / 1_000_000, bank_forks.root(), initial_forks.len(),