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

Report block status more frequently

This commit is contained in:
Michael Vines 2020-07-26 08:37:32 -07:00
parent 1f7af14386
commit 22c46ebf96
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ledger-tool/src/bigtable.rs
View File

@ -10,13 +10,7 @@ use solana_ledger::{blockstore::Blockstore, blockstore_db::AccessType};
use solana_measure::measure::Measure; use solana_measure::measure::Measure;
use solana_sdk::{clock::Slot, pubkey::Pubkey, signature::Signature}; use solana_sdk::{clock::Slot, pubkey::Pubkey, signature::Signature};
use solana_transaction_status::UiTransactionEncoding; use solana_transaction_status::UiTransactionEncoding;
use std::{ use std::{collections::HashSet, path::Path, process::exit, result::Result, time::Duration};
collections::HashSet,
path::Path,
process::exit,
result::Result,
time::{Duration, Instant},
};
use tokio::time::delay_for; use tokio::time::delay_for;
// Attempt to upload this many blocks in parallel // Attempt to upload this many blocks in parallel
@ -137,7 +131,6 @@ async fn upload(
( (
std::thread::spawn(move || { std::thread::spawn(move || {
let mut measure = Measure::start("block loader thread"); let mut measure = Measure::start("block loader thread");
let mut last_status_update = Instant::now();
for (i, slot) in blocks_to_upload.iter().enumerate() { for (i, slot) in blocks_to_upload.iter().enumerate() {
let _ = match blockstore.get_confirmed_block( let _ = match blockstore.get_confirmed_block(
*slot, *slot,
@ -153,14 +146,13 @@ async fn upload(
} }
}; };
if Instant::now().duration_since(last_status_update).as_secs() >= 60 { if i % NUM_BLOCKS_TO_UPLOAD_IN_PARALLEL == 0 {
info!( info!(
"{}% of blocks processed ({}/{})", "{}% of blocks processed ({}/{})",
i * 100 / blocks_to_upload.len(), i * 100 / blocks_to_upload.len(),
i, i,
blocks_to_upload.len() blocks_to_upload.len()
); );
last_status_update = Instant::now();
} }
} }
measure.stop(); measure.stop();