Skip to content

Fix crash when retry handler attemptNumber is >= 57 #338

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.

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

Merged
merged 1 commit into from
Feb 26, 2020
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -12,6 +12,8 @@ class RequestRetryablePolicy: RequestRetryable {
private static let maxWaitMilliseconds = 300 * 1_000 // 5 minutes of max retry duration.
private static let jitterMilliseconds: Float = 100.0

private static let maxExponentForExponentialBackoff = 31

public func retryRequestAdvice(urlError: URLError?,
httpURLResponse: HTTPURLResponse?,
attemptNumber: Int) -> RequestRetryAdvice {
@@ -70,8 +72,13 @@ class RequestRetryablePolicy: RequestRetryable {
/// Returns a delay in milliseconds for the current attempt number. The delay includes random jitter as
/// described in https://aws.amazon.com/blogs/architecture/exponential-backoff-and-jitter/
private func retryDelayInMillseconds(for attemptNumber: Int) -> Int {
var exponent = attemptNumber
if attemptNumber > RequestRetryablePolicy.maxExponentForExponentialBackoff {
exponent = RequestRetryablePolicy.maxExponentForExponentialBackoff
}

let jitter = Double(getRandomBetween0And1() * RequestRetryablePolicy.jitterMilliseconds)
let delay = Int(Double(truncating: pow(2.0, attemptNumber) as NSNumber) * 100.0 + jitter)
let delay = Int(Double(truncating: pow(2.0, exponent) as NSNumber) * 100.0 + jitter)
return delay
}

Original file line number Diff line number Diff line change
@@ -188,6 +188,39 @@ class RequestRetryablePolicyTests: XCTestCase {
XCTAssertEqual(retryAdvice.retryInterval, defaultTimeout)
}

func testMaxValueRetryDelay() {
let retryableErrorCode = URLError.init(.timedOut)

let retryAdvice = retryPolicy.retryRequestAdvice(urlError: retryableErrorCode,
httpURLResponse: nil,
attemptNumber: 31)

XCTAssert(retryAdvice.shouldRetry)
assertMilliseconds(retryAdvice.retryInterval, greaterThan: 214_748_364_800, lessThan: 214_748_364_900)
}

func testBeyondMaxValueRetryDelay() {
let retryableErrorCode = URLError.init(.timedOut)

let retryAdvice = retryPolicy.retryRequestAdvice(urlError: retryableErrorCode,
httpURLResponse: nil,
attemptNumber: 32)

XCTAssert(retryAdvice.shouldRetry)
assertMilliseconds(retryAdvice.retryInterval, greaterThan: 214_748_364_800, lessThan: 214_748_364_900)
}

func testOverflowCase() {
let retryableErrorCode = URLError.init(.timedOut)

let retryAdvice = retryPolicy.retryRequestAdvice(urlError: retryableErrorCode,
httpURLResponse: nil,
attemptNumber: 58)

XCTAssert(retryAdvice.shouldRetry)
assertMilliseconds(retryAdvice.retryInterval, greaterThan: 214_748_364_800, lessThan: 214_748_364_900)
}

func assertMilliseconds(_ retryInterval: DispatchTimeInterval?, greaterThan: Int, lessThan: Int) {
guard let retryInterval = retryInterval else {
XCTFail("retryInterval is nil")