1 files changed, 15 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
index 414b127d6c4..55f6a0b3825 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
@@ -14,6 +14,7 @@ import com.yahoo.container.jdisc.ContainerMbusConfig;
 import com.yahoo.container.jdisc.messagebus.MbusServerProvider;
 import com.yahoo.jdisc.http.ServletPathsConfig;
 import com.yahoo.osgi.provider.model.ComponentModel;
+import com.yahoo.search.config.QrStartConfig;
 import com.yahoo.vespa.config.search.RankProfilesConfig;
 import com.yahoo.vespa.config.search.core.RankingConstantsConfig;
 import com.yahoo.vespa.defaults.Defaults;
@@ -41,6 +42,7 @@ import java.util.stream.Stream;
  */
 public final class ApplicationContainerCluster extends ContainerCluster<ApplicationContainer> implements
         BundlesConfig.Producer,
+        QrStartConfig.Producer,
         RankProfilesConfig.Producer,
         RankingConstantsConfig.Producer,
         ServletPathsConfig.Producer,
@@ -178,6 +180,19 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
             getDocproc().getConfig(builder);
     }
 
+    @Override
+    public void getConfig(QrStartConfig.Builder builder) {
+        super.getConfig(builder);
+        builder.jvm.verbosegc(true)
+                .availableProcessors(0)
+                .heapsize(1536);
+        if (getMemoryPercentage().isPresent()) {
+            builder.jvm.heapSizeAsPercentageOfPhysicalMemory(getMemoryPercentage().get());
+        } else if (isHostedVespa()) {
+            builder.jvm.heapSizeAsPercentageOfPhysicalMemory(getHostClusterId().isPresent() ? 17 : 60);
+        }
+    }
+
     public Optional<TlsSecrets> getTlsSecrets() {
         return tlsSecrets;
     }