grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chain-supplier: fix warning reporting for GetNodeData request (#11530)

Browse Source
This commit is contained in:
Andronik Ordian 2020-02-28 15:31:01 +01:00 committed by GitHub
parent 8572d612a7
commit 0edd55f42f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ethcore/sync/src/chain/supplier.rs
View File

@ -272,16 +272,19 @@ impl SyncSupplier {
let mut added = 0usize; let mut added = 0usize;
let mut data = Vec::new(); let mut data = Vec::new();
let mut total_bytes = 0; let mut total_bytes = 0;
let mut total_elpsd = Duration::from_secs(0); let mut total_elapsed = Duration::from_secs(0);
for i in 0..count { for i in 0..count {
let hash = &r.val_at(i)?; let hash = &r.val_at(i)?;
let elpsd = Instant::now(); let now = Instant::now();
let state = io.chain().state_data(hash); let state = io.chain().state_data(hash);
total_elpsd += elpsd.elapsed(); let elapsed = now.elapsed();
if elpsd.elapsed() > MAX_NODE_DATA_SINGLE_DURATION || total_elpsd > MAX_NODE_DATA_TOTAL_DURATION { total_elapsed += elapsed;
warn!(target: "sync", "{} -> GetNodeData: item {}/{} – slow state fetch for hash {:?}; took {:?}", if elapsed > MAX_NODE_DATA_SINGLE_DURATION || total_elapsed > MAX_NODE_DATA_TOTAL_DURATION {
peer_id, i, count, hash, elpsd); warn!(
target: "sync", "{} -> GetNodeData: item {}/{} – slow state fetch for hash {:?}; took {:?}, total {:?}",
peer_id, i, count, hash, elapsed, total_elapsed,
);
break; break;
} }
if let Some(node) = state { if let Some(node) = state {
@ -294,7 +297,7 @@ impl SyncSupplier {
} }
} }
trace!(target: "sync", "{} -> GetNodeData: returning {}/{} entries ({} bytes total in {:?})", trace!(target: "sync", "{} -> GetNodeData: returning {}/{} entries ({} bytes total in {:?})",
peer_id, added, count, total_bytes, total_elpsd); peer_id, added, count, total_bytes, total_elapsed);
let mut rlp = RlpStream::new_list(added); let mut rlp = RlpStream::new_list(added);
for d in data { for d in data {
rlp.append(&d); rlp.append(&d);