diff options
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java | 2 |
2 files changed, 4 insertions, 4 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 183ab56d45f..323bd73186e 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 @@ -89,7 +89,7 @@ public class ModelProvisioningTest { " <component id='injected' />" + " </handler>" + " <nodes count='2' preload='lib/blablamalloc.so'>" + - " <jvm allocated-memory='45%' gc-options='-XX:+UseParNewGC' options='-verbosegc' />" + + " <jvm allocated-memory='45%' gc-options='-XX:+UseParNewGC' options='-Xlog:gc' />" + " </nodes>" + "</container>" + "</services>"; @@ -139,8 +139,8 @@ public class ModelProvisioningTest { assertEquals(getDefaults().underVespaHome("lib64/vespa/malloc/libvespamalloc.so"), mydisc.getContainers().get(2).getPreLoad()); assertEquals(Optional.empty(), mydisc.getMemoryPercentage()); - assertEquals("-verbosegc", mydisc2.getContainers().get(0).getJvmOptions()); - assertEquals("-verbosegc", mydisc2.getContainers().get(1).getJvmOptions()); + assertEquals("-Xlog:gc", mydisc2.getContainers().get(0).getJvmOptions()); + assertEquals("-Xlog:gc", mydisc2.getContainers().get(1).getJvmOptions()); assertEquals("lib/blablamalloc.so", mydisc2.getContainers().get(0).getPreLoad()); assertEquals("lib/blablamalloc.so", mydisc2.getContainers().get(1).getPreLoad()); assertEquals(Optional.of(45), mydisc2.getMemoryPercentage()); 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 8fc37243483..0cff915266f 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 @@ -254,7 +254,7 @@ public class JvmOptionsTest extends ContainerModelBuilderTestBase { // Valid options, should not log anything verifyLoggingOfJvmOptions(true, "options", "-Xms2G"); - verifyLoggingOfJvmOptions(true, "options", "-verbose:gc"); + verifyLoggingOfJvmOptions(true, "options", "-Xlog:gc"); verifyLoggingOfJvmOptions(true, "options", "-Djava.library.path=/opt/vespa/lib64:/home/y/lib64"); verifyLoggingOfJvmOptions(true, "options", "-XX:-OmitStackTraceInFastThrow"); verifyLoggingOfJvmOptions(false, "options", "-Xms2G"); |