diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-03-13 14:15:55 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-03-13 14:15:55 +0100 |
| commit | 29f97069c7a7fe2155a35272d3dde9c5202b7840 (patch) | |
| tree | c7991af2de7f76f2a26acc40b1420f0b53657582 | |
| parent | 1da9f5f0997bda584d68fad8aeb0a371f153c7bf (diff) | |
Use the jvm options from the feature falg as default also for the logserver and the clustercontroller.
3 files changed, 3 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java index a8621eae3f5..e5d8f9add3f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java @@ -18,6 +18,7 @@ public class LogserverContainerCluster extends ContainerCluster<LogserverContain addDefaultHandlersWithVip(); addLogHandler(); + setJvmGCOptions(deployState.getProperties().jvmGCOptions()); } @Override diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java index abdbb3c90a3..dd16f50b392 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java @@ -25,6 +25,7 @@ public class ClusterControllerContainerCluster extends ContainerCluster<ClusterC addDefaultHandlersWithVip(); this.featureFlags = deployState.featureFlags(); this.reindexingContext = createReindexingContext(deployState); + setJvmGCOptions(deployState.getProperties().jvmGCOptions()); } @Override 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 4efd88c7307..21aad7a565c 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 @@ -617,7 +617,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { String options = (jvmGCOPtions != null) ? jvmGCOPtions : deployState.getProperties().jvmGCOptions(); - return (options == null ||options.isEmpty()) + return (options == null || options.isEmpty()) ? (deployState.isHosted() ? ContainerCluster.CMS : ContainerCluster.G1GC) : options; } |