aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/test/java/com/yahoo/vespa/model/container
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2024-05-30 15:48:10 +0200
committerHarald Musum <musum@yahooinc.com>2024-05-30 15:48:10 +0200
commit2cd05c483243626072dc70c990e93272f1806b11 (patch)
tree706b68e164ad447ae37ca2c0933a7b5b088c73d6 /config-model/src/test/java/com/yahoo/vespa/model/container
parent168311c0e9832c31f371bc56d52c6d09dca89378 (diff)
Stop using feature flag for jvmOmitStackTraceInFastThrowOption
Startup scripts now all set -XX:-OmitStackTraceInFastThrow and no need for a feature flag to control this
Diffstat (limited to 'config-model/src/test/java/com/yahoo/vespa/model/container')
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java24
1 files changed, 0 insertions, 24 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java
index 64afd444989..46097da434e 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java
@@ -2,7 +2,6 @@
package com.yahoo.vespa.model.container.xml;
-import com.yahoo.cloud.config.SentinelConfig;
import com.yahoo.collections.Pair;
import com.yahoo.config.application.api.ApplicationPackage;
import com.yahoo.config.model.NullConfigModelRegistry;
@@ -206,29 +205,6 @@ public class JvmOptionsTest extends ContainerModelBuilderTestBase {
assertEquals("-XX:+UseParNewGC", qrStartConfig.jvm().gcopts());
}
- @Test
- void verify_jvm_option_and_value_from_feature_flag_are_both_included() throws IOException, SAXException {
- String servicesXml = """
- <container version='1.0'>
- <search/>
- <nodes>
- <jvm options="-Xms1024m -Xmx2048m" />
- <node hostalias="node1" />
- </nodes>
- </container>
- """;
- ApplicationPackage applicationPackage = new MockApplicationPackage.Builder().withServices(servicesXml).build();
- // Need to create VespaModel to make deploy properties have effect
- VespaModel model = new VespaModel(new NullConfigModelRegistry(), new DeployState.Builder()
- .applicationPackage(applicationPackage)
- .properties(new TestProperties().setJvmOmitStackTraceInFastThrowOption("-XX:-OmitStackTraceInFastThrow"))
- .build());
- SentinelConfig.Builder builder = new SentinelConfig.Builder();
- model.getConfig(builder, "hosts/localhost");
- SentinelConfig config = builder.build();
- assertEquals("PRELOAD=/opt/vespa/lib64/vespa/malloc/libvespamalloc.so exec ${VESPA_HOME}/libexec/vespa/vespa-wrapper vespa-start-container-daemon -Xms1024m -Xmx2048m -XX:-OmitStackTraceInFastThrow ", config.service().get(0).command());
- }
-
private void verifyLoggingOfJvmGcOptions(boolean isHosted, String override, String... invalidOptions) throws IOException, SAXException {
verifyLogMessage(isHosted, "gc-options", override, invalidOptions);
}