diff options
4 files changed, 2 insertions, 16 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index ce67d0d8317..3588645232c 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -113,8 +113,8 @@ public interface ModelContext { Optional<ApplicationRoles> applicationRoles(); - // TODO(bjorncs): Temporary feature flag, revisit July 2020 - default Duration jdiscHealthCheckProxyClientTimeout() { return Duration.ofSeconds(1); } + // TODO(bjorncs): Temporary feature flag, revisit August 2020 + default Duration jdiscHealthCheckProxyClientTimeout() { return Duration.ofMillis(100); } } } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java index 3cf7bdabb4d..6ad69540eb2 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java @@ -25,7 +25,6 @@ import com.yahoo.vespa.flags.Flags; import java.io.File; import java.net.URI; -import java.time.Duration; import java.util.List; import java.util.Optional; import java.util.Set; @@ -159,7 +158,6 @@ public class ModelContextImpl implements ModelContext { private final int numResponseThreads; private final Optional<AthenzDomain> athenzDomain; private final Optional<ApplicationRoles> applicationRoles; - private final int jdiscHealthCheckProxyClientTimeout; public Properties(ApplicationId applicationId, boolean multitenantFromConfig, @@ -208,8 +206,6 @@ public class ModelContextImpl implements ModelContext { .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); this.athenzDomain = athenzDomain; this.applicationRoles = applicationRoles; - jdiscHealthCheckProxyClientTimeout = Flags.JDISC_HEALTH_CHECK_PROXY_CLIENT_TIMEOUT.bindTo(flagSource) - .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); } @Override @@ -283,7 +279,6 @@ public class ModelContextImpl implements ModelContext { return applicationRoles; } - @Override public Duration jdiscHealthCheckProxyClientTimeout() { return Duration.ofMillis(jdiscHealthCheckProxyClientTimeout); } @Override public String jvmGCOptions() { return jvmGCOPtions; } @Override public String feedSequencerType() { return feedSequencer; } diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index d37dfb2bbe1..6addf4b932c 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -272,12 +272,6 @@ public class Flags { "Takes effect on next deployment (controller)", ZONE_ID); - public static final UnboundIntFlag JDISC_HEALTH_CHECK_PROXY_CLIENT_TIMEOUT = defineIntFlag( - "jdisc-health-check-proxy-client-timeout", 1000, - "Temporary flag to rollout reduced timeout for JDisc's health check proxy client. Timeout in milliseconds", - "Takes effect on next internal redeployment", - APPLICATION_ID); - public static final UnboundBooleanFlag APPLICATION_IAM_ROLE = defineFeatureFlag( "application-iam-roles", false, "Allow separate iam roles when provisioning/assigning hosts", diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java index 5ae5359d097..3b178b4ff89 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java @@ -107,9 +107,6 @@ class HealthCheckProxyHandler extends HandlerWrapper { log.log(Level.INFO, message); log.log(Level.FINE, e.toString(), e); servletResponse.sendError(Response.Status.INTERNAL_SERVER_ERROR, message); - if (Duration.ofSeconds(1).compareTo(proxyTarget.timeout) >= 0) { // TODO bjorncs: remove call to close() if client is correctly pruning bad connections (VESPA-17628) - proxyTarget.close(); - } } } else { servletResponse.sendError(NOT_FOUND); |