diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2021-03-22 11:10:34 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2021-03-22 11:10:34 +0100 |
commit | a8bcbe17f3e88d150350a2d6e70843046741cbe9 (patch) | |
tree | 53b70d69178ec404a68d34ba674083ebc48b3764 /config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java | |
parent | d8f9994a519bf15974b83bfb71cd2a56f878bb6c (diff) |
Set jvmargs based on cluster type
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.java | 5 |
1 files changed, 4 insertions, 1 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 dd16f50b392..c4bd7198e11 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 @@ -5,9 +5,12 @@ import com.yahoo.config.model.api.ModelContext; import com.yahoo.config.model.api.Reindexing; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.producer.AbstractConfigProducer; +import com.yahoo.config.provision.ClusterSpec; import com.yahoo.search.config.QrStartConfig; import com.yahoo.vespa.model.container.ContainerCluster; +import java.util.Optional; + /** * Container cluster for cluster-controller containers. * @@ -25,7 +28,7 @@ public class ClusterControllerContainerCluster extends ContainerCluster<ClusterC addDefaultHandlersWithVip(); this.featureFlags = deployState.featureFlags(); this.reindexingContext = createReindexingContext(deployState); - setJvmGCOptions(deployState.getProperties().jvmGCOptions()); + setJvmGCOptions(deployState.getProperties().jvmGCOptions(Optional.of(ClusterSpec.Type.admin))); } @Override |