Skip to content

Fixing retry logic to not hit service when Retry-After header returned #190

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

Merged
merged 1 commit into from
Jun 11, 2018
Merged

Fixing retry logic to not hit service when Retry-After header returned #190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 24 additions & 17 deletions Source/HTTP/httpcall.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,20 @@ bool http_call_should_retry(
}
if (call->traceCall) { HC_TRACE_INFORMATION(HTTPCLIENT, "HCHttpCallPerformExecute [ID %llu] delayBeforeRetry %lld ms", call->id, call->delayBeforeRetry.count()); }

// Remember result if there was an error and there was a Retry-After header
if (call->retryAfterCacheId != 0 &&
retryAfter.count() > 0 &&
httpStatus > 400)
{
auto retryAfterTime = retryAfter + responseReceivedTime;
http_retry_after_api_state state(retryAfterTime, httpStatus);
auto httpSingleton = get_http_singleton(false);
if (httpSingleton)
{
httpSingleton->set_retry_state(call->retryAfterCacheId, state);
}
}

if (remainingTimeBeforeTimeout < call->delayBeforeRetry + std::chrono::milliseconds(MIN_HTTP_TIMEOUT_IN_MS))
{
// Don't bother retrying when out of time
Expand All @@ -259,20 +273,6 @@ bool http_call_should_retry(
}
}

// Remember result if there was an error and there was a Retry-After header
if (call->retryAfterCacheId != 0 &&
retryAfter.count() > 0 &&
httpStatus > 400)
{
auto retryAfterTime = retryAfter + responseReceivedTime;
http_retry_after_api_state state(retryAfterTime, httpStatus);
auto httpSingleton = get_http_singleton(false);
if (httpSingleton)
{
httpSingleton->set_retry_state(call->retryAfterCacheId, state);
}
}

return true;
}

Expand All @@ -282,9 +282,12 @@ bool http_call_should_retry(
bool should_fast_fail(
_In_ http_retry_after_api_state apiState,
_In_ HC_CALL* call,
_In_ const chrono_clock_t::time_point& currentTime
_In_ const chrono_clock_t::time_point& currentTime,
_Out_ bool* clearState
)
{
*clearState = false;

if (apiState.statusCode < 400)
{
return false;
Expand All @@ -293,6 +296,8 @@ bool should_fast_fail(
std::chrono::milliseconds remainingTimeBeforeRetryAfterInMS = std::chrono::duration_cast<std::chrono::milliseconds>(apiState.retryAfterTime - currentTime);
if (remainingTimeBeforeRetryAfterInMS.count() <= 0)
{
// Only clear the API cache when Retry-After time is up
*clearState = true;
return false;
}

Expand Down Expand Up @@ -339,13 +344,15 @@ void retry_http_call_until_done(
http_retry_after_api_state apiState = httpSingleton->get_retry_state(retryContext->call->retryAfterCacheId);
if (apiState.statusCode >= 400)
{
if (should_fast_fail(apiState, retryContext->call, requestStartTime))
bool clearState = false;
if (should_fast_fail(apiState, retryContext->call, requestStartTime, &clearState))
{
HCHttpCallResponseSetStatusCode(retryContext->call, apiState.statusCode);
if (retryContext->call->traceCall) { HC_TRACE_INFORMATION(HTTPCLIENT, "HCHttpCallPerformExecute [ID %llu] Fast fail %d", retryContext->call->id, apiState.statusCode); }
CompleteAsync(retryContext->outerAsyncBlock, S_OK, 0);
}
else

if( clearState )
{
httpSingleton->clear_retry_state(retryContext->call->retryAfterCacheId);
}
Expand Down