Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add delays to network retries. #11881

Merged
merged 6 commits into from
Apr 1, 2023
Merged

Add delays to network retries. #11881

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b5d772f
Split the `cargo::util::network` module into submodules
ehuss Mar 22, 2023
c38e050
Allow RegistryBuilder responder URLs to be a String
ehuss Mar 23, 2023
6bd1209
Add delays to network retries.
ehuss Mar 23, 2023
2f8dafe
Add some more docs and comments to `SleepTracker`.
ehuss Mar 25, 2023
e0d8204
Add `_MS` suffix to retry constants.
ehuss Mar 31, 2023
4fdea65
Don't place side-effect expressions in assert! macros.
ehuss Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add _MS suffix to retry constants.
  • Loading branch information
@ehuss
ehuss committed Mar 31, 2023
commit e0d8204aed829e45835b9885dbe073d006ebc058
18 changes: 9 additions & 9 deletions src/cargo/util/network/retry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ pub enum RetryResult<T> {
}

/// Maximum amount of time a single retry can be delayed (milliseconds).
const MAX_RETRY_SLEEP: u64 = 10 * 1000;
const MAX_RETRY_SLEEP_MS: u64 = 10 * 1000;
/// The minimum initial amount of time a retry will be delayed (milliseconds).
///
/// The actual amount of time will be a random value above this.
const INITIAL_RETRY_SLEEP_BASE: u64 = 500;
const INITIAL_RETRY_SLEEP_BASE_MS: u64 = 500;
/// The maximum amount of additional time the initial retry will take (milliseconds).
///
/// The initial delay will be [`INITIAL_RETRY_SLEEP_BASE`] plus a random range
/// The initial delay will be [`INITIAL_RETRY_SLEEP_BASE_MS`] plus a random range
/// from 0 to this value.
const INITIAL_RETRY_JITTER: u64 = 1000;
const INITIAL_RETRY_JITTER_MS: u64 = 1000;

impl<'a> Retry<'a> {
pub fn new(config: &'a Config) -> CargoResult<Retry<'a>> {
Expand All @@ -55,11 +55,11 @@ impl<'a> Retry<'a> {
self.retries += 1;
let sleep = if self.retries == 1 {
let mut rng = rand::thread_rng();
INITIAL_RETRY_SLEEP_BASE + rng.gen_range(0..INITIAL_RETRY_JITTER)
INITIAL_RETRY_SLEEP_BASE_MS + rng.gen_range(0..INITIAL_RETRY_JITTER_MS)
} else {
min(
((self.retries - 1) * 3) * 1000 + INITIAL_RETRY_SLEEP_BASE,
MAX_RETRY_SLEEP,
((self.retries - 1) * 3) * 1000 + INITIAL_RETRY_SLEEP_BASE_MS,
MAX_RETRY_SLEEP_MS,
)
};
RetryResult::Retry(sleep)
Expand Down Expand Up @@ -208,8 +208,8 @@ fn default_retry_schedule() {
match retry.r#try(|| spurious()) {
RetryResult::Retry(sleep) => {
assert!(
sleep >= INITIAL_RETRY_SLEEP_BASE
&& sleep < INITIAL_RETRY_SLEEP_BASE + INITIAL_RETRY_JITTER
sleep >= INITIAL_RETRY_SLEEP_BASE_MS
&& sleep < INITIAL_RETRY_SLEEP_BASE_MS + INITIAL_RETRY_JITTER_MS
);
}
_ => panic!("unexpected non-retry"),
Expand Down