diff options
| author | Geir Storli <geirst@oath.com> | 2018-11-06 14:30:19 +0000 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:25 +0100 |
| commit | 688ddd833113cfdcae1701a7ac5ad76f4916cbcf (patch) | |
| tree | 1cc966de6cf30f023962e8ad5ad8376a4886bb4e | |
| parent | f19965394cda05598e73c1e9f278d827e2996914 (diff) | |
Use G1GC as default on Vespa 7 (fixup after rebasing).
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 2 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/qr-start.def | 2 |
2 files changed, 2 insertions, 2 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 2fb7fd03dfd..f18c3a13689 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 @@ -464,7 +464,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { jvmOptions = nodesElement.getAttribute(VespaDomBuilder.JVMARGS_ATTRIB_NAME); if (incompatibleGCOptions(jvmOptions)) { deployLogger.log(Level.WARNING, "You need to move out your GC related options from 'jvmargs' to 'jvm-gc-options'"); - cluster.setJvmGCOptions(ContainerCluster.CMS); + cluster.setJvmGCOptions(ContainerCluster.G1GC); } } return jvmOptions; diff --git a/container-search/src/main/resources/configdefinitions/qr-start.def b/container-search/src/main/resources/configdefinitions/qr-start.def index 2b575ad1fe0..46a35ef2fc8 100644 --- a/container-search/src/main/resources/configdefinitions/qr-start.def +++ b/container-search/src/main/resources/configdefinitions/qr-start.def @@ -9,7 +9,7 @@ jvm.server bool default=true restart jvm.verbosegc bool default=true restart ## Garbage Collection tuning parameters -jvm.gcopts string default="-XX:MaxTenuringThreshold=15 -XX:NewRatio=1" restart +jvm.gcopts string default="-XX:+UseG1GC -XX:MaxTenuringThreshold=15 -XX:NewRatio=1" restart ## Heap size (in megabytes) for the Java VM jvm.heapsize int default=1536 restart |