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

updater: apply exponential backoff after download failure (#8059)

Browse Source 
* updater: apply exponential backoff after download failure

* updater: reset backoff on new release
This commit is contained in:
André Silva 2018-03-06 21:16:38 +01:00 committed by Marek Kotewicz
parent f54944bbfc
commit f48b09b76e
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
updater/src/updater.rs
View File

@ -18,6 +18,7 @@ use std::fs;
use std::io::Write;
use std::path::{PathBuf};
use std::sync::{Arc, Weak};
use std::time::{Duration, Instant};
use ethcore::client::{BlockId, BlockChainClient, ChainNotify};
use ethsync::{SyncProvider};
@ -82,6 +83,8 @@ struct UpdaterState {
capability: CapState,
disabled: bool,
backoff: Option<(u32, Instant)>,
}
/// Service for checking for updates and determining whether we can achieve consensus.
@ -260,7 +263,19 @@ impl Updater {
let fetched = s.fetching.take().unwrap();
let dest = self.updates_path(&Self::update_file_name(&fetched.version));
if !dest.exists() {
let b = result.map_err(|e| (format!("Unable to fetch update ({}): {:?}", fetched.version, e), false))?;
let b = match result {
Ok(b) => {
s.backoff = None;
b
},
Err(e) => {
let mut n = s.backoff.map(|b| b.0 + 1).unwrap_or(1);
s.backoff = Some((n, Instant::now() + Duration::from_secs(2usize.pow(n) as u64)));
return Err((format!("Unable to fetch update ({}): {:?}", fetched.version, e), false));
},
};
info!(target: "updater", "Fetched latest version ({}) OK to {}", fetched.version, b.display());
fs::create_dir_all(dest.parent().expect("at least one thing pushed; qed")).map_err(|e| (format!("Unable to create updates path: {:?}", e), true))?;
fs::copy(&b, &dest).map_err(|e| (format!("Unable to copy update: {:?}", e), true))?;
@ -320,12 +335,14 @@ impl Updater {
drop(s);
self.fetch_done(Ok(PathBuf::new()));
} else {
info!(target: "updater", "Attempting to get parity binary {}", b);
s.fetching = Some(latest.track.clone());
drop(s);
let weak_self = self.weak_self.lock().clone();
let f = move |r: Result<PathBuf, fetch::Error>| if let Some(this) = weak_self.upgrade() { this.fetch_done(r) };
self.fetcher.fetch(b, Box::new(f));
if s.backoff.iter().all(|&(_, instant)| Instant::now() >= instant) {
info!(target: "updater", "Attempting to get parity binary {}", b);
s.fetching = Some(latest.track.clone());
drop(s);
let weak_self = self.weak_self.lock().clone();
let f = move |r: Result<PathBuf, fetch::Error>| if let Some(this) = weak_self.upgrade() { this.fetch_done(r) };
self.fetcher.fetch(b, Box::new(f));
}
}
}
}
@ -354,6 +371,11 @@ impl Updater {
}
let mut s = self.state.lock();
if s.latest != latest {
s.backoff = None;
}
s.latest = latest;
s.capability = capability;
}