Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-01-21 03:21:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

body_sync every 5s, but request 10*most_work_peers blocks at a time (#448)

Browse source 
header_sync every 10s
This commit is contained in:
AntiochP 2017-12-08 12:12:10 -05:00 committed by Ignotus Peverell
parent a4e0b5c56a
commit 0a87c0ced1
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chain/src/chain.rs
View file

@ -33,7 +33,7 @@ use sumtree;
use types::*; use types::*;
use util::LOGGER; use util::LOGGER;
const MAX_ORPHANS: usize = 20; const MAX_ORPHANS: usize = 50;
/// Facade to the blockchain block processing pipeline and storage. Provides /// Facade to the blockchain block processing pipeline and storage. Provides
/// the current view of the UTXO set according to the chain state. Also /// the current view of the UTXO set according to the chain state. Also

20
grin/src/sync.rs
View file

@ -46,8 +46,8 @@ pub fn run_sync(
if a_inner.is_syncing() { if a_inner.is_syncing() {
let current_time = time::now_utc(); let current_time = time::now_utc();
// run the header sync every 5s // run the header sync every 10s
if current_time - prev_header_sync > time::Duration::seconds(5) { if current_time - prev_header_sync > time::Duration::seconds(10) {
header_sync( header_sync(
p2p_server.clone(), p2p_server.clone(),
chain.clone(), chain.clone(),
@ -55,8 +55,8 @@ pub fn run_sync(
prev_header_sync = current_time; prev_header_sync = current_time;
} }
// run the body_sync every iteration (1s) // run the body_sync every 5s
if current_time - prev_body_sync > time::Duration::seconds(1) { if current_time - prev_body_sync > time::Duration::seconds(5) {
body_sync( body_sync(
p2p_inner.clone(), p2p_inner.clone(),
c_inner.clone(), c_inner.clone(),
@ -64,9 +64,9 @@ pub fn run_sync(
prev_body_sync = current_time; prev_body_sync = current_time;
} }
thread::sleep(Duration::from_millis(250)); thread::sleep(Duration::from_secs(1));
} else { } else {
thread::sleep(Duration::from_secs(5)); thread::sleep(Duration::from_secs(10));
} }
} }
}); });
@ -109,24 +109,28 @@ fn body_sync(
} }
hashes.reverse(); hashes.reverse();
// if we have 5 most_work_peers then ask for 50 blocks total (peer_count * 10)
// max will be 80 if all 8 peers are advertising most_work
let peer_count = { let peer_count = {
p2p_server.most_work_peers().len() p2p_server.most_work_peers().len()
}; };
let block_count = peer_count * 10;
let hashes_to_get = hashes let hashes_to_get = hashes
.iter() .iter()
.filter(|x| !chain.get_block(&x).is_ok()) .filter(|x| !chain.get_block(&x).is_ok())
.take(peer_count * 2) .take(block_count)
.cloned() .cloned()
.collect::<Vec<_>>(); .collect::<Vec<_>>();
if hashes_to_get.len() > 0 { if hashes_to_get.len() > 0 {
debug!( debug!(
LOGGER, LOGGER,
"block_sync: requesting blocks ({}/{}), {:?}", "block_sync: {}/{} requesting blocks {:?} from {} peers",
body_head.height, body_head.height,
header_head.height, header_head.height,
hashes_to_get, hashes_to_get,
peer_count,
); );
for hash in hashes_to_get.clone() { for hash in hashes_to_get.clone() {