diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-01-28 10:12:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-28 10:12:08 +0100 |
| commit | 00b55fc6af62bcd596218f826431e27b39807179 (patch) | |
| tree | f3b617080e67673377041b871857f0d0f91a85c5 /controller-server | |
| parent | 09e6b7198b885229bc9cbd37301e6d93af4b210a (diff) | |
| parent | 1f8eccf8955cb400f43d693b04bbab571c51de9f (diff) | |
Merge pull request #11969 from vespa-engine/bjorncs/response-based-retry-handler
Bjorncs/response based retry handler
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/FlagsClient.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/FlagsClient.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/FlagsClient.java index 992d0754cc5..2993b780dfe 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/FlagsClient.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/FlagsClient.java @@ -1,7 +1,7 @@ // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.restapi.systemflags; -import ai.vespa.util.http.retry.DelayedHttpRequestRetryHandler; +import ai.vespa.util.http.retry.DelayedConnectionLevelRetryHandler; import com.fasterxml.jackson.databind.ObjectMapper; import com.yahoo.vespa.athenz.api.AthenzIdentity; import com.yahoo.vespa.athenz.identity.ServiceIdentityProvider; @@ -24,7 +24,6 @@ import org.apache.http.client.utils.URIBuilder; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.DefaultHttpRequestRetryHandler; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.message.BasicNameValuePair; import org.apache.http.util.EntityUtils; @@ -85,12 +84,11 @@ class FlagsClient { private static CloseableHttpClient createClient(ServiceIdentityProvider identityProvider, Set<FlagsTarget> targets) { - DelayedHttpRequestRetryHandler retryHandler = DelayedHttpRequestRetryHandler.Builder + DelayedConnectionLevelRetryHandler retryHandler = DelayedConnectionLevelRetryHandler.Builder .withExponentialBackoff(Duration.ofSeconds(1), Duration.ofSeconds(20), 5) .build(); return HttpClientBuilder.create() .setUserAgent("controller-flags-v1-client") - .setRetryHandler(new DefaultHttpRequestRetryHandler(5, /*retry on non-idempotent requests*/true)) .setSSLContext(identityProvider.getIdentitySslContext()) .setSSLHostnameVerifier(new FlagTargetsHostnameVerifier(targets)) .setDefaultRequestConfig(RequestConfig.custom() |