development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-09-13 21:11:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks to retry logic

Browse source 
* Don't use `chain_err` internally inside `try` because then the spurious error
  printed internally is bland and doesn't contain the right error information.
  Instead place the `chain_err` on the outside so it propagates up to the user
  still but doesn't get printed for spurious errors.

* Handle `pending_ids` management in the case of an error on the connection.
This commit is contained in:
Alex Crichton 2018-09-17 11:42:45 -07:00
parent 78922ca84f
commit 304871c793
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/cargo/core/package.rs
View file

@ -489,15 +489,14 @@ impl<'a, 'cfg> Downloads<'a, 'cfg> {
.expect("got a token for a non-in-progress transfer");
let data = mem::replace(&mut *dl.data.borrow_mut(), Vec::new());
let mut handle = self.set.multi.remove(handle)?;
self.pending_ids.remove(&dl.id);
// Check if this was a spurious error. If it was a spurious error
// then we want to re-enqueue our request for another attempt and
// then we wait for another request to finish.
let ret = {
self.retry.try(|| {
result.chain_err(|| {
format!("failed to download from `{}`", dl.url)
})?;
result?;
let code = handle.response_code()?;
if code != 200 && code != 0 {
@ -508,14 +507,18 @@ impl<'a, 'cfg> Downloads<'a, 'cfg> {
}.into())
}
Ok(())
}).chain_err(|| {
format!("failed to download from `{}`", dl.url)
})?
};
if ret.is_some() {
break (dl, data)
match ret {
Some(()) => break (dl, data),
None => {
self.pending_ids.insert(dl.id.clone());
self.enqueue(dl, handle)?
}
}
self.enqueue(dl, handle)?;
};
self.pending_ids.remove(&dl.id);
// If the progress bar isn't enabled then we still want to provide some
// semblance of progress of how we're downloading crates.