diff options
Diffstat (limited to 'config-model/src/test/java')
4 files changed, 87 insertions, 30 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 743dfc5ca73..f9585224bd6 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 @@ -86,7 +86,7 @@ public class ModelProvisioningTest { " <handler id='myHandler'>" + " <component id='injected' />" + " </handler>" + - " <nodes count='2' allocated-memory='45%' jvm-gc-options='-XX:+UseParNewGC' jvmargs='-verbosegc' preload='lib/blablamalloc.so'/>" + + " <nodes count='2' allocated-memory='45%' jvm-gc-options='-XX:+UseParNewGC' jvm-options='-verbosegc' preload='lib/blablamalloc.so'/>" + "</jdisc>" + "</services>"; String hosts ="<hosts>" @@ -127,16 +127,16 @@ public class ModelProvisioningTest { assertThat(mydisc2.getContainers().get(1).getConfigId(), is("mydisc2/container.1")); assertTrue(mydisc2.getContainers().get(1).isInitialized()); - assertThat(mydisc.getContainers().get(0).getJvmArgs(), is("")); - assertThat(mydisc.getContainers().get(1).getJvmArgs(), is("")); - assertThat(mydisc.getContainers().get(2).getJvmArgs(), is("")); + assertThat(mydisc.getContainers().get(0).getJvmOptions(), is("")); + assertThat(mydisc.getContainers().get(1).getJvmOptions(), is("")); + assertThat(mydisc.getContainers().get(2).getJvmOptions(), is("")); assertThat(mydisc.getContainers().get(0).getPreLoad(), is(getDefaults().underVespaHome("lib64/vespa/malloc/libvespamalloc.so"))); assertThat(mydisc.getContainers().get(1).getPreLoad(), is(getDefaults().underVespaHome("lib64/vespa/malloc/libvespamalloc.so"))); assertThat(mydisc.getContainers().get(2).getPreLoad(), is(getDefaults().underVespaHome("lib64/vespa/malloc/libvespamalloc.so"))); assertThat(mydisc.getMemoryPercentage(), is(Optional.empty())); - assertThat(mydisc2.getContainers().get(0).getJvmArgs(), is("-verbosegc")); - assertThat(mydisc2.getContainers().get(1).getJvmArgs(), is("-verbosegc")); + assertThat(mydisc2.getContainers().get(0).getJvmOptions(), is("-verbosegc")); + assertThat(mydisc2.getContainers().get(1).getJvmOptions(), is("-verbosegc")); assertThat(mydisc2.getContainers().get(0).getPreLoad(), is("lib/blablamalloc.so")); assertThat(mydisc2.getContainers().get(1).getPreLoad(), is("lib/blablamalloc.so")); assertThat(mydisc2.getMemoryPercentage(), is(Optional.of(45))); @@ -261,13 +261,13 @@ public class ModelProvisioningTest { } @Test - public void testCombinedClusterWithJvmArgs() { + public void testCombinedClusterWithJvmOptions() { String xmlWithNodes = "<?xml version='1.0' encoding='utf-8' ?>" + "<services>" + " <container version='1.0' id='container1'>" + " <document-processing/>" + - " <nodes of='content1' jvmargs='testarg'/>" + + " <nodes of='content1' jvm-options='testoption'/>" + " </container>" + " <content version='1.0' id='content1'>" + " <redundancy>2</redundancy>" + @@ -284,7 +284,7 @@ public class ModelProvisioningTest { assertEquals("Nodes in content1", 2, model.getContentClusters().get("content1").getRootGroup().getNodes().size()); assertEquals("Nodes in container1", 2, model.getContainerClusters().get("container1").getContainers().size()); for (Container container : model.getContainerClusters().get("container1").getContainers()) - assertTrue(container.getJvmArgs().contains("testarg")); + assertTrue(container.getJvmOptions().contains("testoption")); } @Test @@ -1225,6 +1225,58 @@ public class ModelProvisioningTest { } @Test + public void testJvmArgs() { + String services = + "<?xml version='1.0' encoding='utf-8' ?>\n" + + "<jdisc version='1.0'>" + + " <search/>" + + " <nodes jvmargs='xyz' count='3'/>" + + "</jdisc>"; + int numberOfHosts = 3; + VespaModelTester tester = new VespaModelTester(); + tester.addHosts(numberOfHosts); + VespaModel model = tester.createModel(services, true); + assertEquals(numberOfHosts, model.getRoot().getHostSystem().getHosts().size()); + assertEquals("xyz", model.getContainerClusters().get("jdisc").getContainers().get(0).getAssignedJvmOptions()); + } + + @Test + public void testJvmOptions() { + String services = + "<?xml version='1.0' encoding='utf-8' ?>\n" + + "<jdisc version='1.0'>" + + " <search/>" + + " <nodes jvm-options='xyz' count='3'/>" + + "</jdisc>"; + int numberOfHosts = 3; + VespaModelTester tester = new VespaModelTester(); + tester.addHosts(numberOfHosts); + VespaModel model = tester.createModel(services, true); + assertEquals(numberOfHosts, model.getRoot().getHostSystem().getHosts().size()); + assertEquals("xyz", model.getContainerClusters().get("jdisc").getContainers().get(0).getAssignedJvmOptions()); + } + + @Test + public void testJvmOptionsOverridesJvmArgs() { + String services = + "<?xml version='1.0' encoding='utf-8' ?>\n" + + "<jdisc version='1.0'>" + + " <search/>" + + " <nodes jvm-options='xyz' jvmargs='abc' count='3'/>" + + "</jdisc>"; + int numberOfHosts = 3; + VespaModelTester tester = new VespaModelTester(); + tester.addHosts(numberOfHosts); + try { + tester.createModel(services, true); + fail("Expected exception"); + } + catch (IllegalArgumentException e) { + assertEquals("You have specified both jvm-options='xyz' and deprecated jvmargs='abc'. Merge jvmargs into jvm-options.", e.getMessage()); + } + } + + @Test public void testUsingHostaliasWithProvisioner() { String services = "<?xml version='1.0' encoding='utf-8' ?>\n" + @@ -1418,7 +1470,7 @@ public class ModelProvisioningTest { " <document-processing/>\n" + " <document-api/>\n" + " <search/>\n" + - " <nodes jvmargs=\"-Xms512m -Xmx512m\">\n" + + " <nodes jvm-options=\"-Xms512m -Xmx512m\">\n" + " <node hostalias=\"vespa-1\"/>\n" + " </nodes>\n" + " </container>\n" + @@ -1477,7 +1529,7 @@ public class ModelProvisioningTest { " <document-processing/>\n" + " <document-api/>\n" + " <search/>\n" + - " <nodes jvmargs=\"-Xms512m -Xmx512m\">\n" + + " <nodes jvm-options=\"-Xms512m -Xmx512m\">\n" + " <node hostalias=\"vespa-1\"/>\n" + " <node hostalias=\"vespa-2\"/>\n" + " <node hostalias=\"vespa-3\"/>\n" + diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java index c9d89a50449..b4dea09010d 100755 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java @@ -168,15 +168,15 @@ public class ContainerClusterTest { addContainer(root.deployLogger(), cluster, "c1", "host-c1"); assertEquals(1, cluster.getContainers().size()); Container container = cluster.getContainers().get(0); - verifyJvmArgs(isHosted, hasDocProc, "", container.getJvmArgs()); - container.setJvmArgs("initial"); - verifyJvmArgs(isHosted, hasDocProc, "initial", container.getJvmArgs()); - container.prependJvmArgs("ignored"); - verifyJvmArgs(isHosted, hasDocProc, "ignored initial", container.getJvmArgs()); - container.appendJvmArgs("override"); - verifyJvmArgs(isHosted, hasDocProc, "ignored initial override", container.getJvmArgs()); - container.setJvmArgs(null); - verifyJvmArgs(isHosted, hasDocProc, "", container.getJvmArgs()); + verifyJvmArgs(isHosted, hasDocProc, "", container.getJvmOptions()); + container.setJvmOptions("initial"); + verifyJvmArgs(isHosted, hasDocProc, "initial", container.getJvmOptions()); + container.prependJvmOptions("ignored"); + verifyJvmArgs(isHosted, hasDocProc, "ignored initial", container.getJvmOptions()); + container.appendJvmOptions("override"); + verifyJvmArgs(isHosted, hasDocProc, "ignored initial override", container.getJvmOptions()); + container.setJvmOptions(null); + verifyJvmArgs(isHosted, hasDocProc, "", container.getJvmOptions()); } @Test @@ -259,10 +259,10 @@ public class ContainerClusterTest { ContainerCluster cluster = createContainerCluster(root, false); addContainer(root.deployLogger(), cluster, "c1", "host-c1"); Container container = cluster.getContainers().get(0); - container.setJvmArgs(""); - String empty = container.getJvmArgs(); - container.setJvmArgs(null); - assertEquals(empty, container.getJvmArgs()); + container.setJvmOptions(""); + String empty = container.getJvmOptions(); + container.setJvmOptions(null); + assertEquals(empty, container.getJvmOptions()); } @Test 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 efa0d42f014..396fe3e0af5 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 @@ -95,12 +95,17 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { } private static void verifyIgnoreJvmGCOptions(boolean isHosted) throws IOException, SAXException { + verifyIgnoreJvmGCOptionsIfJvmArgs(isHosted, "jvmargs", ContainerCluster.CMS); + verifyIgnoreJvmGCOptionsIfJvmArgs(isHosted, "jvm-options", "-XX:+UseG1GC"); + + } + private static void verifyIgnoreJvmGCOptionsIfJvmArgs(boolean isHosted, String jvmOptionsName, String expectedGC) throws IOException, SAXException { String servicesXml = "<jdisc version='1.0'>" + - " <nodes jvm-gc-options='-XX:+UseG1GC' jvmargs='-XX:+UseParNewGC'>" + - " <node hostalias='mockhost'/>" + - " </nodes>" + - "</jdisc>"; + " <nodes jvm-gc-options='-XX:+UseG1GC' " + jvmOptionsName + "='-XX:+UseParNewGC'>" + + " <node hostalias='mockhost'/>" + + " </nodes>" + + "</jdisc>"; ApplicationPackage applicationPackage = new MockApplicationPackage.Builder().withServices(servicesXml).build(); // Need to create VespaModel to make deploy properties have effect final MyLogger logger = new MyLogger(); @@ -115,7 +120,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { QrStartConfig.Builder qrStartBuilder = new QrStartConfig.Builder(); model.getConfig(qrStartBuilder, "jdisc/container.0"); QrStartConfig qrStartConfig = new QrStartConfig(qrStartBuilder); - assertEquals(ContainerCluster.CMS, qrStartConfig.jvm().gcopts()); + assertEquals(expectedGC, qrStartConfig.jvm().gcopts()); } @Test diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java index 69e2dba556a..31c1e250183 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java @@ -26,7 +26,7 @@ public class StorageGroupTest { "<content id=\"storage\">\n" + " <documents/>" + " <group>\n" + - " <node jvmargs=\"foo\" hostalias=\"mockhost\" distribution-key=\"0\"/>\n" + + " <node hostalias=\"mockhost\" distribution-key=\"0\"/>\n" + " <node hostalias=\"mockhost\" distribution-key=\"1\"/>\n" + " </group>\n" + "</content>" |