diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-06-06 19:43:15 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:30 +0200 |
commit | 8d6f093b172ef6001d24dd39c51338b9f7943fc3 (patch) | |
tree | 213b24456e16ebcb3ee4eeba5b8eff326480cfb7 | |
parent | a3836826938bd0414a611c79beadeedd644c6fb0 (diff) |
Remove on Vespa 8
3 files changed, 4 insertions, 19 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java index e9bf65cda2d..79412368eae 100755 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java @@ -171,11 +171,6 @@ public abstract class ContainerCluster<CONTAINER extends Container> componentGroup = new ComponentGroup<>(this, "component"); addCommonVespaBundles(); - - // TODO Vespa 8: remove LoggingRequestHandler.Context component if we can break binary compatibility - // (ThreadedHttpRequestHandler.Context is source compatible.) - addSimpleComponent("com.yahoo.container.jdisc.LoggingRequestHandler$Context"); - addSimpleComponent(AccessLog.class); addComponent(new DefaultThreadpoolProvider(this, defaultPoolNumThreads)); addSimpleComponent(com.yahoo.concurrent.classlock.ClassLocking.class); diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java index b56743954f4..7060a23111b 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java @@ -189,19 +189,9 @@ public class ConnectorFactory { @SuppressWarnings("removal") private SslContextFactory createSslContextFactory() { - try { - DefaultConnectorSsl ssl = new DefaultConnectorSsl(); - sslProvider.configureSsl(ssl, connectorConfig.name(), connectorConfig.listenPort()); - return ssl.createSslContextFactory(); - } catch (UnsupportedOperationException e) { - // TODO(bjorncs) Vespa 8 Remove this compatibility workaround - if (sslProvider instanceof SslContextFactoryProvider) { - return ((SslContextFactoryProvider) sslProvider) - .getInstance(connectorConfig.name(), connectorConfig.listenPort()); - } else { - throw e; - } - } + DefaultConnectorSsl ssl = new DefaultConnectorSsl(); + sslProvider.configureSsl(ssl, connectorConfig.name(), connectorConfig.listenPort()); + return ssl.createSslContextFactory(); } private ALPNServerConnectionFactory newAlpnConnectionFactory() { diff --git a/container-core/src/main/resources/configdefinitions/container.core.vip-status.def b/container-core/src/main/resources/configdefinitions/container.core.vip-status.def index 4a50018c3c3..44165bf14c3 100644 --- a/container-core/src/main/resources/configdefinitions/container.core.vip-status.def +++ b/container-core/src/main/resources/configdefinitions/container.core.vip-status.def @@ -8,5 +8,5 @@ accessdisk bool default=false ## If the path is relative vespa home is prepended statusfile string default="share/qrsdocs/status.html" -## Not used TODO: Remove on Vespa 8? - always set to true? +## Whether this container should be in rotation by default on startup initiallyInRotation bool default=true |