Also detect cms args

2 files changed, 3 insertions, 4 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index 29763839dac..af5d9dd1dcf 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -453,10 +453,8 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
 
     static boolean incompatibleGCOptions(String jvmargs) {
         Pattern gcAlgorithm = Pattern.compile("-XX:[-+]Use.+GC");
-        if (gcAlgorithm.matcher(jvmargs).find()) {
-            return true;
-        }
-        return false;
+        Pattern cmsArgs = Pattern.compile("-XX:[-+]*CMS");
+        return (gcAlgorithm.matcher(jvmargs).find() ||cmsArgs.matcher(jvmargs).find());
     }
     private void addNodesFromXml(ContainerCluster cluster, Element containerElement, ConfigModelContext context) {
         Element nodesElement = XML.getChild(containerElement, "nodes");
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
index 5d708dcddf4..b5c1f7ce26d 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
@@ -74,6 +74,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
         assertFalse(ContainerModelBuilder.incompatibleGCOptions("UseG1GC"));
         assertTrue(ContainerModelBuilder.incompatibleGCOptions("-XX:+UseG1GC"));
         assertTrue(ContainerModelBuilder.incompatibleGCOptions("abc -XX:+UseParNewGC xyz"));
+        assertTrue(ContainerModelBuilder.incompatibleGCOptions("-XX:CMSInitiatingOccupancyFraction=19"));
     }
 
     @Test