Skip to content

HTTPCLIENT-2421: Use effective retry interval for response timeout check #830

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

Open
arturobernalg wants to merge 1 commit into
base: master
Choose a base branch
from
+23 −3
Open

HTTPCLIENT-2421: Use effective retry interval for response timeout check #830

Show file tree
Hide file tree
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
13 changes: 10 additions & 3 deletions ...lient5/src/main/java/org/apache/hc/client5/http/impl/DefaultHttpRequestRetryStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,15 +203,22 @@ public boolean retryRequest(
final HttpContext context) {
Args.notNull(response, "response");

if (execCount > this.maxRetries || !this.retriableCodes.contains(response.getCode())) {
return false;
}

if (context != null) {
final HttpClientContext clientContext = HttpClientContext.cast(context);
final RequestConfig requestConfig = clientContext.getRequestConfigOrDefault();
final Timeout responseTimeout = requestConfig.getResponseTimeout();
if (responseTimeout != null && defaultRetryInterval.compareTo(responseTimeout) > 0) {
return false;
if (responseTimeout != null) {
final TimeValue retryInterval = getRetryInterval(response, execCount, context);
if (retryInterval.compareTo(responseTimeout) > 0) {
return false;
}
}
}
return execCount <= this.maxRetries && retriableCodes.contains(response.getCode());
return true;
}

@Override
Expand Down
13 changes: 13 additions & 0 deletions ...t5/src/test/java/org/apache/hc/client5/http/impl/TestDefaultHttpRequestRetryStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,4 +188,17 @@ void retryOnNonAbortedRequests() {
Assertions.assertTrue(retryStrategy.retryRequest(request, new IOException(), 1, null));
}

@Test
void testRetryRequestWithResponseTimeoutAndRetryAfterHeader() {
final HttpResponse response = new BasicHttpResponse(429, "Too Many Requests");
response.setHeader(HttpHeaders.RETRY_AFTER, "321");

final HttpClientContext context = HttpClientContext.create();
context.setRequestConfig(RequestConfig.custom()
.setResponseTimeout(Timeout.ofSeconds(2L))
.build());

Assertions.assertFalse(retryStrategy.retryRequest(response, 1, context));
}

}
Loading