Merge pull request #22617 from vespa-engine/hmusum/gc-flag-usage

GC usage of FAIL_DEPLOYMENT_WITH_INVALID_JVM_OPTIONS feature flag

2 files changed, 6 insertions, 42 deletions

diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index 323bd73186e..f164a1045b6 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -1554,14 +1554,14 @@ public class ModelProvisioningTest {
                 "<?xml version='1.0' encoding='utf-8' ?>\n" +
                         "<container version='1.0'>" +
                         "  <search/>" +
-                        "  <nodes jvmargs='xyz' count='3'/>" +
+                        "  <nodes jvmargs='-DfooOption=xyz' count='3'/>" +
                         "</container>";
         int numberOfHosts = 3;
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
         VespaModel model = tester.createModel(services, true);
         assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size());
-        assertEquals("xyz", model.getContainerClusters().get("container").getContainers().get(0).getAssignedJvmOptions());
+        assertEquals("-DfooOption=xyz", model.getContainerClusters().get("container").getContainers().get(0).getAssignedJvmOptions());
     }
 
     @Test
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 0cff915266f..b2c29b88e38 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
@@ -148,24 +148,7 @@ public class JvmOptionsTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void requireThatInvalidJvmGcOptionsAreLogged() throws IOException, SAXException {
-        verifyLoggingOfJvmGcOptions(true,
-                                    "-XX:+ParallelGCThreads=8 foo     bar",
-                                    "foo", "bar");
-        verifyLoggingOfJvmGcOptions(true,
-                                    "-XX:+UseCMSInitiatingOccupancyOnly foo     bar",
-                                    "-XX:+UseCMSInitiatingOccupancyOnly", "foo", "bar");
-        verifyLoggingOfJvmGcOptions(true,
-                                    "-XX:+UseConcMarkSweepGC",
-                                    "-XX:+UseConcMarkSweepGC");
-        verifyLoggingOfJvmGcOptions(true,
-                                    "$(touch /tmp/hello-from-gc-options)",
-                                    "$(touch", "/tmp/hello-from-gc-options)");
-
-        verifyLoggingOfJvmGcOptions(false,
-                                    "$(touch /tmp/hello-from-gc-options)",
-                                    "$(touch", "/tmp/hello-from-gc-options)");
-
+    public void requireThatValidJvmGcOptionsAreNotLogged() throws IOException, SAXException {
         // Valid options, should not log anything
         verifyLoggingOfJvmGcOptions(true, "-XX:+ParallelGCThreads=8");
         verifyLoggingOfJvmGcOptions(true, "-XX:MaxTenuringThreshold=15"); // No + or - after colon
@@ -175,7 +158,7 @@ public class JvmOptionsTest extends ContainerModelBuilderTestBase {
     @Test
     public void requireThatInvalidJvmGcOptionsFailDeployment() throws IOException, SAXException {
         try {
-            buildModelWithJvmOptions(new TestProperties().setHostedVespa(true).failDeploymentWithInvalidJvmOptions(true),
+            buildModelWithJvmOptions(new TestProperties().setHostedVespa(true),
                     new TestLogger(),
                     "gc-options",
                     "-XX:+ParallelGCThreads=8 foo     bar");
@@ -232,26 +215,7 @@ public class JvmOptionsTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void requireThatJvmOptionsAreLogged()  throws IOException, SAXException {
-        verifyLoggingOfJvmOptions(true,
-                                  "options",
-                                  "-Xms2G foo     bar",
-                                  "foo", "bar");
-        verifyLoggingOfJvmOptions(true,
-                                  "options",
-                                  "$(touch /tmp/hello-from-gc-options)",
-                                  "$(touch", "/tmp/hello-from-gc-options)");
-
-        verifyLoggingOfJvmOptions(true,
-                                  "options",
-                                  "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005",
-                                  "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005");
-
-        verifyLoggingOfJvmOptions(false,
-                                  "options",
-                                  "$(touch /tmp/hello-from-gc-options)",
-                                  "$(touch", "/tmp/hello-from-gc-options)");
-
+    public void requireThatValidJvmOptionsAreNotLogged() throws IOException, SAXException {
         // Valid options, should not log anything
         verifyLoggingOfJvmOptions(true, "options", "-Xms2G");
         verifyLoggingOfJvmOptions(true, "options", "-Xlog:gc");
@@ -263,7 +227,7 @@ public class JvmOptionsTest extends ContainerModelBuilderTestBase {
     @Test
     public void requireThatInvalidJvmOptionsFailDeployment() throws IOException, SAXException {
         try {
-            buildModelWithJvmOptions(new TestProperties().setHostedVespa(true).failDeploymentWithInvalidJvmOptions(true),
+            buildModelWithJvmOptions(new TestProperties().setHostedVespa(true),
                                      new TestLogger(),
                                      "options",
                                      "-Xms2G foo     bar");