diff options
author | Arne H Juul <arnej@yahooinc.com> | 2022-01-03 13:05:08 +0000 |
---|---|---|
committer | Arne H Juul <arnej@yahooinc.com> | 2022-01-03 13:05:08 +0000 |
commit | ef67e176184d8d2261d9f6de788897c37fea0294 (patch) | |
tree | ac87d6d673b92b44a7dd19eaf322b1e72c38ed64 /config-model/src | |
parent | 2ff775ff41d2d759c62f7423a34c795c3ea2a504 (diff) | |
parent | 1f3e5d1003a33d9a7076575eab8059c582611cdb (diff) |
Merge branch 'master' into arnej/feature-flag-for-user-agents
Conflicts:
config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
Diffstat (limited to 'config-model/src')
3 files changed, 29 insertions, 6 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java index 9ad257fad04..7c386875d02 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java @@ -23,6 +23,7 @@ public final class ApplicationContainer extends Container implements private static final String defaultHostedJVMArgs = "-XX:+SuppressFatalErrorMessage"; private final boolean isHostedVespa; + private final boolean enableServerOcspStapling; public ApplicationContainer(AbstractConfigProducer<?> parent, String name, int index, DeployState deployState) { this(parent, name, false, index, deployState); @@ -31,6 +32,7 @@ public final class ApplicationContainer extends Container implements public ApplicationContainer(AbstractConfigProducer<?> parent, String name, boolean retired, int index, DeployState deployState) { super(parent, name, retired, index, deployState); this.isHostedVespa = deployState.isHosted(); + this.enableServerOcspStapling = deployState.featureFlags().enableServerOcspStapling(); addComponent(new SimpleComponent("com.yahoo.container.jdisc.messagebus.NetworkMultiplexerHolder")); addComponent(new SimpleComponent("com.yahoo.container.jdisc.messagebus.NetworkMultiplexerProvider")); @@ -64,10 +66,23 @@ public final class ApplicationContainer extends Container implements /** Returns the jvm arguments this should start with */ @Override public String getJvmOptions() { + StringBuilder b = new StringBuilder(); + if (isHostedVespa) { + if (hasDocproc()) { + b.append(ApplicationContainer.defaultHostedJVMArgs).append(' '); + } + if (enableServerOcspStapling) { + b.append("-Djdk.tls.server.enableStatusRequestExtension=true ") + .append("-Djdk.tls.stapling.responseTimeout=2000 ") + .append("-Djdk.tls.stapling.cacheSize=256 ") + .append("-Djdk.tls.stapling.cacheLifetime=3600 "); + } + } String jvmArgs = super.getJvmOptions(); - return isHostedVespa && hasDocproc() - ? ("".equals(jvmArgs) ? defaultHostedJVMArgs : defaultHostedJVMArgs + " " + jvmArgs) - : jvmArgs; + if (!jvmArgs.isBlank()) { + b.append(jvmArgs.trim()); + } + return b.toString().trim(); } private boolean hasDocproc() { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/generic/GenericServicesBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/generic/GenericServicesBuilder.java index 77acffe7f9d..7a0278faa48 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/generic/GenericServicesBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/generic/GenericServicesBuilder.java @@ -13,6 +13,8 @@ import java.util.List; /** * @author Ulf Lilleengen * @since 5.1 + * + * TODO: remove in Vespa 8 */ public class GenericServicesBuilder extends ConfigModelBuilder<GenericServicesModel> { @@ -22,7 +24,7 @@ public class GenericServicesBuilder extends ConfigModelBuilder<GenericServicesMo @Override public List<ConfigModelId> handlesElements() { - return Arrays.asList(ConfigModelId.fromName("service")); + return List.of(ConfigModelId.fromName("service")); } @Override diff --git a/config-model/src/main/java/com/yahoo/vespa/model/generic/builder/DomServiceClusterBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/generic/builder/DomServiceClusterBuilder.java index ea2151648cc..1ac668049f0 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/generic/builder/DomServiceClusterBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/generic/builder/DomServiceClusterBuilder.java @@ -8,10 +8,13 @@ import com.yahoo.vespa.model.builder.xml.dom.VespaDomBuilder; import com.yahoo.vespa.model.generic.service.ServiceCluster; import org.w3c.dom.Element; import java.util.Map; +import java.util.logging.Level; /** -* @author Ulf Lilleengen -*/ + * @author Ulf Lilleengen + * + * TODO: remove in Vespa 8 + */ public class DomServiceClusterBuilder extends VespaDomBuilder.DomConfigProducerBuilder<ServiceCluster> { private final String name; @@ -22,6 +25,9 @@ public class DomServiceClusterBuilder extends VespaDomBuilder.DomConfigProducerB @Override protected ServiceCluster doBuild(DeployState deployState, AbstractConfigProducer<?> ancestor, Element spec) { + deployState.getDeployLogger().logApplicationPackage( + Level.WARNING, "The 'service' element is deprecated and will be removed in Vespa 8, without replacement."); + ServiceCluster cluster = new ServiceCluster(ancestor, name, spec.getAttribute("command")); int nodeIndex = 0; for (Element nodeSpec : XML.getChildren(spec, "node")) { |