diff options
author | HÃ¥kon Hallingstad <hakon@oath.com> | 2018-10-30 09:15:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-30 09:15:53 +0100 |
commit | b83edd843e9eddd36d57f07f919bcf6475196363 (patch) | |
tree | 193da8781cffcfa821a9f43ea5531f36f3eb0476 /jaxrs_client_utils/src/main/java/com | |
parent | 522ecd04d8a655ad99f4b915ea37e7c5c3cbb39b (diff) |
Revert "Revert "Revert "Enforce CC timeouts in Orchestrator 2"""
Diffstat (limited to 'jaxrs_client_utils/src/main/java/com')
6 files changed, 19 insertions, 119 deletions
diff --git a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsClientFactory.java b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsClientFactory.java index 27d7024b9bd..d004ac3af45 100644 --- a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsClientFactory.java +++ b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsClientFactory.java @@ -3,55 +3,11 @@ package com.yahoo.vespa.jaxrs.client; import com.yahoo.vespa.applicationmodel.HostName; -import java.net.URI; -import java.time.Duration; - /** * Interface for creating a JAX-RS client API instance for a single server endpoint. * * @author bakksjo */ public interface JaxRsClientFactory { - class Params<T> { - private final Class<T> apiClass; - private final URI uri; - - private Duration connectTimeout = Duration.ofSeconds(30); - private Duration readTimeout = Duration.ofSeconds(30); - - public Params(Class<T> apiClass, URI uri) { - this.apiClass = apiClass; - this.uri = uri; - } - - public Class<T> apiClass() { - return apiClass; - } - - public URI uri() { - return uri; - } - - public void setConnectTimeout(Duration timeout) { - this.connectTimeout = timeout; - } - - public Duration connectTimeout() { - return connectTimeout; - } - - public void setReadTimeout(Duration timeout) { - readTimeout = timeout; - } - - public Duration readTimeout() { - return readTimeout; - } - } - - default <T> T createClient(Params<T> params) { - return createClient(params.apiClass, new HostName(params.uri.getHost()), params.uri.getPort(), params.uri.getPath(), params.uri.getScheme()); - } - <T> T createClient(Class<T> apiClass, HostName hostName, int port, String pathPrefix, String scheme); } diff --git a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsStrategy.java b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsStrategy.java index cd7d8684cbc..72af76fe54c 100644 --- a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsStrategy.java +++ b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsStrategy.java @@ -11,8 +11,4 @@ import java.util.function.Function; */ public interface JaxRsStrategy<T> { <R> R apply(final Function<T, R> function) throws IOException; - - default <R> R apply(final Function<T, R> function, JaxRsTimeouts timeouts) throws IOException { - return apply(function); - } } diff --git a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsTimeouts.java b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsTimeouts.java deleted file mode 100644 index 6758d6f94d6..00000000000 --- a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsTimeouts.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.yahoo.vespa.jaxrs.client; - -import java.time.Duration; - -/** - * @author hakonhall - */ -public interface JaxRsTimeouts { - /** - * The connect timeout, which must be at least 1ms. - * - * Throws com.google.common.util.concurrent.UncheckedTimeoutException on timeout. - */ - Duration getConnectTimeoutOrThrow(); - - /** - * The read timeout, which must be at least 1ms. - * - * Throws com.google.common.util.concurrent.UncheckedTimeoutException on timeout. - */ - Duration getReadTimeoutOrThrow(); -} diff --git a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JerseyJaxRsClientFactory.java b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JerseyJaxRsClientFactory.java index 8aa880fb0e4..9321f8e290d 100644 --- a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JerseyJaxRsClientFactory.java +++ b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JerseyJaxRsClientFactory.java @@ -23,20 +23,34 @@ import java.util.Collections; */ public class JerseyJaxRsClientFactory implements JaxRsClientFactory { + private static final int DEFAULT_CONNECT_TIMEOUT_MS = 30000; + private static final int DEFAULT_READ_TIMEOUT_MS = 30000; + // Client is a heavy-weight object with a finalizer so we create only one and re-use it private final Client client; public JerseyJaxRsClientFactory() { - this(null, null, null); + this(DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_READ_TIMEOUT_MS); } public JerseyJaxRsClientFactory(SSLContext sslContext, HostnameVerifier hostnameVerifier, String userAgent) { + this(DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_READ_TIMEOUT_MS, sslContext, hostnameVerifier, userAgent); + } + + public JerseyJaxRsClientFactory(int connectTimeoutMs, int readTimeoutMs) { + this(connectTimeoutMs, readTimeoutMs, null, null, null); + } + + public JerseyJaxRsClientFactory(int connectTimeoutMs, int readTimeoutMs, SSLContext sslContext, + HostnameVerifier hostnameVerifier, String userAgent) { /* * Configure client with some workarounds for HTTP/JAX-RS/Jersey issues. See: * https://jersey.java.net/apidocs/latest/jersey/org/glassfish/jersey/client/ClientProperties.html#SUPPRESS_HTTP_COMPLIANCE_VALIDATION * https://jersey.java.net/apidocs/latest/jersey/org/glassfish/jersey/client/HttpUrlConnectorProvider.html#SET_METHOD_WORKAROUND */ ClientBuilder builder = ClientBuilder.newBuilder() + .property(ClientProperties.CONNECT_TIMEOUT, connectTimeoutMs) + .property(ClientProperties.READ_TIMEOUT, readTimeoutMs) .property(ClientProperties.SUPPRESS_HTTP_COMPLIANCE_VALIDATION, true) // Allow empty PUT. TODO: Fix API. .property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true) // Allow e.g. PATCH method. .property(ClientProperties.FOLLOW_REDIRECTS, true); @@ -53,16 +67,10 @@ public class JerseyJaxRsClientFactory implements JaxRsClientFactory { } @Override - public <T> T createClient(Params<T> params) { - WebTarget target = client.target(params.uri()); - target.property(ClientProperties.CONNECT_TIMEOUT, (int) params.connectTimeout().toMillis()); - target.property(ClientProperties.READ_TIMEOUT, (int) params.readTimeout().toMillis()); - return WebResourceFactory.newResource(params.apiClass(), target); - } - - @Override public <T> T createClient(Class<T> apiClass, HostName hostName, int port, String pathPrefix, String scheme) { UriBuilder uriBuilder = UriBuilder.fromPath(pathPrefix).host(hostName.s()).port(port).scheme(scheme); - return createClient(new Params<>(apiClass, uriBuilder.build())); + WebTarget target = client.target(uriBuilder); + return WebResourceFactory.newResource(apiClass, target); } + } diff --git a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/LegacyJaxRsTimeouts.java b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/LegacyJaxRsTimeouts.java deleted file mode 100644 index 3f2139f6bf0..00000000000 --- a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/LegacyJaxRsTimeouts.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.yahoo.vespa.jaxrs.client; - -import java.time.Duration; - -/** - * Legacy defaults for timeouts. - * - * Clients should instead define their own JaxRsTimeouts tailored to their use-case. - * - * @author hakonhall - */ -// Immutable -public class LegacyJaxRsTimeouts implements JaxRsTimeouts { - private static final Duration CONNECT_TIMEOUT = Duration.ofSeconds(30); - private static final Duration READ_TIMEOUT = Duration.ofSeconds(30); - - @Override - public Duration getConnectTimeoutOrThrow() { - return CONNECT_TIMEOUT; - } - - @Override - public Duration getReadTimeoutOrThrow() { - return READ_TIMEOUT; - } -} diff --git a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/RetryingJaxRsStrategy.java b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/RetryingJaxRsStrategy.java index 4c97147d61e..65b302ef4ff 100644 --- a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/RetryingJaxRsStrategy.java +++ b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/RetryingJaxRsStrategy.java @@ -4,9 +4,7 @@ package com.yahoo.vespa.jaxrs.client; import com.yahoo.vespa.applicationmodel.HostName; import javax.ws.rs.ProcessingException; -import javax.ws.rs.core.UriBuilder; import java.io.IOException; -import java.net.URI; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -67,21 +65,11 @@ public class RetryingJaxRsStrategy<T> implements JaxRsStrategy<T> { @Override public <R> R apply(final Function<T, R> function) throws IOException { - return apply(function, new LegacyJaxRsTimeouts()); - } - - - @Override - public <R> R apply(final Function<T, R> function, JaxRsTimeouts timeouts) throws IOException { ProcessingException sampleException = null; for (int i = 0; i < maxIterations; ++i) { for (final HostName hostName : hostNames) { - URI uri = UriBuilder.fromPath(pathPrefix).port(port).scheme(scheme).host(hostName.s()).build(); - JaxRsClientFactory.Params<T> params = new JaxRsClientFactory.Params<>(apiClass, uri); - params.setConnectTimeout(timeouts.getConnectTimeoutOrThrow()); - params.setReadTimeout(timeouts.getReadTimeoutOrThrow()); - final T jaxRsClient = jaxRsClientFactory.createClient(params); + final T jaxRsClient = jaxRsClientFactory.createClient(apiClass, hostName, port, pathPrefix, scheme); try { return function.apply(jaxRsClient); } catch (ProcessingException e) { |