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

Dead downloads need to be retried, not discarded

Browse source
This commit is contained in:
Ignotus Peverell 2017-10-17 09:38:55 +00:00
parent ef08140ad7
commit 60efa62896
No known key found for this signature in database
GPG key ID: 99CD25F39F8F8211
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
grin/src/sync.rs
View file

@ -141,18 +141,22 @@ impl Syncer {
/// Asks for the blocks we haven't downloaded yet and place them in the /// Asks for the blocks we haven't downloaded yet and place them in the
/// downloading structure. /// downloading structure.
fn request_bodies(&self) { fn request_bodies(&self) {
let mut blocks_to_download = self.blocks_to_download.lock().unwrap();
let mut blocks_downloading = self.blocks_downloading.lock().unwrap(); let mut blocks_downloading = self.blocks_downloading.lock().unwrap();
// clean up potentially dead downloads // clean up potentially dead downloads
let twenty_sec_ago = Instant::now() - Duration::from_secs(20); let twenty_sec_ago = Instant::now() - Duration::from_secs(20);
blocks_downloading let too_old_pos = (0..blocks_downloading.len()).filter(|p| {
.iter() blocks_downloading[*p].1 < twenty_sec_ago
.position(|&h| h.1 < twenty_sec_ago) }).collect::<Vec<_>>();
.map(|n| blocks_downloading.remove(n)); for too_old in too_old_pos {
let block_h = blocks_downloading.remove(too_old);
debug!(LOGGER, "Download request expired for {}, will re-issue.", block_h.0);
blocks_to_download.insert(0, block_h.0);
}
// consume hashes from blocks to download, place them in downloading and // consume hashes from blocks to download, place them in downloading and
// request them from the network // request them from the network
let mut blocks_to_download = self.blocks_to_download.lock().unwrap();
while blocks_to_download.len() > 0 && blocks_downloading.len() < MAX_BODY_DOWNLOADS { while blocks_to_download.len() > 0 && blocks_downloading.len() < MAX_BODY_DOWNLOADS {
let h = blocks_to_download.pop().unwrap(); let h = blocks_to_download.pop().unwrap();
let peer = self.p2p.random_peer().unwrap(); let peer = self.p2p.random_peer().unwrap();
@ -164,7 +168,7 @@ impl Syncer {
} }
debug!( debug!(
LOGGER, LOGGER,
"Requesting more full block hashes to download, total: {}.", "Requesting full blocks to download, total left: {}.",
blocks_to_download.len() blocks_to_download.len()
); );
} }