aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2021-03-13 14:15:55 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2021-03-13 14:15:55 +0100
commit29f97069c7a7fe2155a35272d3dde9c5202b7840 (patch)
treec7991af2de7f76f2a26acc40b1420f0b53657582 /config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
parent1da9f5f0997bda584d68fad8aeb0a371f153c7bf (diff)
Use the jvm options from the feature falg as default also for the logserver and the clustercontroller.
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java1
1 files changed, 1 insertions, 0 deletions
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